Go to file
keyeqing c3ffff9891 Merge branch 'master' of https://github.com/justinliucs/haflow.git
Conflicts:
	src/main/java/haflow/dto/entity/Flow.java
	src/main/java/haflow/service/FlowService.java
	src/main/java/haflow/ui/controller/FlowController.java
	src/main/java/haflow/ui/controller/HomeController.java
	src/main/java/haflow/ui/helper/FlowHelper.java
	src/main/resources/hibernate.cfg.xml
	src/main/webapp/WEB-INF/views/logon.jsp
	src/main/webapp/WEB-INF/views/main.jsp
	src/main/webapp/style/haflow.main.css
2013-10-09 15:08:29 +08:00
WebContent/META-INF Merge branch 'master' of https://github.com/justinliucs/haflow.git 2013-10-09 15:08:29 +08:00
maven-install Merge branch 'master' of https://github.com/justinliucs/haflow 2013-10-08 17:28:09 +08:00
src Merge branch 'master' of https://github.com/justinliucs/haflow.git 2013-10-09 15:08:29 +08:00
.gitignore repair conflict 2013-08-30 21:58:39 +08:00
README.md Initial commit 2013-04-17 02:07:24 -07:00
haflow.module.init.jar add log4j. change module upload dir from /classes to /lib. 2013-09-06 10:01:56 +08:00
haflow.module.jar change java7 to java6 2013-06-06 15:59:00 +08:00
pom.xml Merge branch 'master' of https://github.com/justinliucs/haflow 2013-10-08 17:28:09 +08:00
readme.txt Merge branch 'master' of https://github.com/justinliucs/haflow 2013-10-08 17:28:09 +08:00

README.md

haflow

web-based Hadoop analysis workflow design and execution.