You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/01/25 00:25:54 UTC

storm git commit: backport STORM-1484/1478 to 1.0.0, too

Repository: storm
Updated Branches:
  refs/heads/master 60aa4919e -> 36f03ed7e


backport STORM-1484/1478 to 1.0.0, too


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/36f03ed7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/36f03ed7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/36f03ed7

Branch: refs/heads/master
Commit: 36f03ed7e6031ee3a212ba38f051615ea3c6584d
Parents: 60aa491
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Jan 25 08:25:35 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Jan 25 08:25:35 2016 +0900

----------------------------------------------------------------------
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/36f03ed7/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08884e2..471d999 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 ## 2.0.0
- * STORM-1484: ignore subproject .classpath & .project file
- * STORM-1478: make bolts getComponentConfiguration method cleaner/simpler
 
 ## 1.0.0
+ * STORM-1484: ignore subproject .classpath & .project file
+ * STORM-1478: make bolts getComponentConfiguration method cleaner/simpler
  * STORM-1499: fix wrong package name for storm trident
  * STORM-1463: added file scehma to log4j config files for windows env
  * STORM-1485: DRPC Connectivity Issues