alibaba · xinchun-wang · Aug 18, 2015 · Nov 19, 2015 · Dec 10, 2015 · Dec 26, 2015
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,11 @@ target/*
 */target/*
 /bin
 .idea
+<<<<<<< HEAD
+*.iml
+=======
 *.iml
 docs/jstorm-doc/_site
 docs/jstorm-doc/.sass-cache
-docs/jstorm-doc/target
+docs/jstorm-doc/target
+>>>>>>> e8b4ac859fd5c7cef27517bc0ff950748d810f4b
diff --git a/example/sequence-split-merge/.gitignore b/example/sequence-split-merge/.gitignore
@@ -1,2 +1,4 @@
 /target/
-/target/
+.project
+.settings/
+.classpath
diff --git a/jstorm-core/.gitignore b/jstorm-core/.gitignore
@@ -1 +1,4 @@
 /target/
+.project
+.settings/
+.classpath
diff --git a/jstorm-on-yarn/.gitignore b/jstorm-on-yarn/.gitignore
@@ -0,0 +1,4 @@
+/target/
+.project
+.settings/
+.classpath
diff --git a/jstorm-ui/.gitignore b/jstorm-ui/.gitignore
@@ -1 +1,5 @@
 /target/
+*.class
+.project
+.settings/
+.classpath
diff --git a/jstorm-utility/jstorm-kafka/.gitignore b/jstorm-utility/jstorm-kafka/.gitignore
@@ -1 +1,4 @@
 /target/
+.project
+.settings/
+.classpath
diff --git a/jstorm-utility/jstorm-rocket-mq/.gitignore b/jstorm-utility/jstorm-rocket-mq/.gitignore
@@ -0,0 +1,4 @@
+/target/
+.project
+.settings/
+.classpath
diff --git a/jstorm-utility/jstorm-rocket-mq/target/classes/META-INF/MANIFEST.MF b/jstorm-utility/jstorm-rocket-mq/target/classes/META-INF/MANIFEST.MF
diff --git a/...storm-rocket-mq/target/classes/META-INF/maven/com.alibaba.jstorm/metaspout/pom.properties b/...storm-rocket-mq/target/classes/META-INF/maven/com.alibaba.jstorm/metaspout/pom.properties
diff --git a/...ility/jstorm-rocket-mq/target/classes/META-INF/maven/com.alibaba.jstorm/metaspout/pom.xml b/...ility/jstorm-rocket-mq/target/classes/META-INF/maven/com.alibaba.jstorm/metaspout/pom.xml
diff --git a/jstorm-utility/ons/.gitignore b/jstorm-utility/ons/.gitignore
@@ -0,0 +1,4 @@
+/target/
+.project
+.settings/
+.classpath
diff --git a/jstorm-utility/transaction_meta_spout/.gitignore b/jstorm-utility/transaction_meta_spout/.gitignore
@@ -0,0 +1,4 @@
+/target/
+.project
+.settings/
+.classpath