You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/03/30 21:51:00 UTC
[1/4] storm git commit: refactor gitignore
Repository: storm
Updated Branches:
refs/heads/1.x-branch 20ba5189f -> 652d2f6eb
refactor gitignore
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/74e31c27
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/74e31c27
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/74e31c27
Branch: refs/heads/1.x-branch
Commit: 74e31c27acc36558f8b6011586261bd86662c5cb
Parents: 1cfaf12
Author: Xin Wang <be...@163.com>
Authored: Sun Mar 27 17:37:40 2016 +0800
Committer: Xin Wang <be...@163.com>
Committed: Tue Mar 29 22:10:39 2016 +0800
----------------------------------------------------------------------
.gitignore | 33 +++++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/74e31c27/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 6ec109b..5c66aba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,7 @@
/classes
/lib
deploy/lib
-deploy/logs
.emacs-project
-*.jar
bin/jzmq
.DS_Store
deploy/classes
@@ -21,23 +19,38 @@ _release
*.zip
*.tar.gz
.lein-deps-sum
-*.iml
target
/.project/
/.lein-plugins/
-*.ipr
-*.iws
-.idea
#.*
!/.travis.yml
!/.gitignore
_site
dependency-reduced-pom.xml
-derby.log
metastore_db
+build
+/docs/javadocs
+*.class
+
+# logs
+logs
+*.log
+
+# Eclipse
.settings/
.project
.classpath
-logs
-build
-/docs/javadocs
+
+# Intellij
+*.iml
+*.ipr
+*.iws
+.idea
+
+# Package Files
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
[2/4] storm git commit: remove flux gitignore
Posted by pt...@apache.org.
remove flux gitignore
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/89506186
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/89506186
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/89506186
Branch: refs/heads/1.x-branch
Commit: 895061868d86339f9e6bd33b81685903db06f510
Parents: 74e31c2
Author: Xin Wang <be...@163.com>
Authored: Sun Mar 27 23:02:23 2016 +0800
Committer: Xin Wang <be...@163.com>
Committed: Tue Mar 29 22:11:00 2016 +0800
----------------------------------------------------------------------
external/flux/.gitignore | 15 ---------------
1 file changed, 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/89506186/external/flux/.gitignore
----------------------------------------------------------------------
diff --git a/external/flux/.gitignore b/external/flux/.gitignore
deleted file mode 100644
index 35fb1db..0000000
--- a/external/flux/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-*.class
-**/target
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# Intellij
-**/*.iml
-**/*.ipr
-**/*.iws
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
[3/4] storm git commit: Merge branch 'STORM-1660-1.x' of
github.com:vesense/storm into 1.x-branch
Posted by pt...@apache.org.
Merge branch 'STORM-1660-1.x' of github.com:vesense/storm into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/aeb4b9d5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/aeb4b9d5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/aeb4b9d5
Branch: refs/heads/1.x-branch
Commit: aeb4b9d55c68bf62761831baae9d5df49e0ab99a
Parents: 20ba518 8950618
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Mar 30 15:49:35 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Mar 30 15:49:35 2016 -0400
----------------------------------------------------------------------
.gitignore | 33 +++++++++++++++++++++++----------
external/flux/.gitignore | 15 ---------------
2 files changed, 23 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
[4/4] storm git commit: add STORM-1660 to changelog
Posted by pt...@apache.org.
add STORM-1660 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/652d2f6e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/652d2f6e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/652d2f6e
Branch: refs/heads/1.x-branch
Commit: 652d2f6eb9315a8605cbc51a3f98adc9aa13271c
Parents: aeb4b9d
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Mar 30 15:50:34 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Mar 30 15:50:34 2016 -0400
----------------------------------------------------------------------
CHANGELOG.md | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/652d2f6e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fb0902..c37ef4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,5 @@
## 1.0.0
- * STORM-1634: Refactoring of Resource Aware Scheduler
- * STORM-1030: Hive Connector Fixes
- * STORM-676: Storm Trident support for sliding/tumbling windows
- * STORM-1630: Add guide page for Windows users
- * STORM-1655: Flux doesn't set return code to non-zero when there's any exception while deploying topology to remote cluster
- * STORM-1654: HBaseBolt creates tick tuples with no interval when we don't set flushIntervalSecs
- * STORM-1625: Move storm-sql dependencies out of lib folder
+ * STORM-1660: remove flux gitignore file and move rules to top level gitignore
* STORM-1622: Rename classes with older third party shaded packages
* STORM-1537: Upgrade to kryo 3
* STORM-1556: nimbus.clj/wait-for-desired-code-replication wrong reset for current-replication-count-jar in local mode