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 2015/06/10 03:32:32 UTC
[4/5] storm git commit: Merge branch 'master' into 0.10.x-branch
Merge branch 'master' into 0.10.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3d5058d7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3d5058d7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3d5058d7
Branch: refs/heads/0.10.x-branch
Commit: 3d5058d779260c5a23180cd711ba2239a1dfde39
Parents: 6f2052b 58372f0
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jun 9 21:24:03 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jun 9 21:24:03 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
storm-core/src/clj/backtype/storm/converter.clj | 11 +++++++----
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 8 ++++++--
3 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3d5058d7/CHANGELOG.md
----------------------------------------------------------------------
diff --cc CHANGELOG.md
index 6245f5f,77977e0..544ecf7
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,4 -1,7 +1,5 @@@
-## 0.11.0
-
## 0.10.0
+ * STORM-856: use serialized value of delay secs for topo actions
* STORM-852: Replaced Apache Log4j Logger with SLF4J API
* STORM-813: Change storm-starter's README so that it explains mvn exec:java cannot run multilang topology
* STORM-853: Fix upload API to handle multi-args properly