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:29 UTC
[1/5] storm git commit: use serialized value of delay secs for topo
actions
Repository: storm
Updated Branches:
refs/heads/0.10.x-branch 6f2052b0e -> d1e10ceec
use serialized value of delay secs for topo actions
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/128ee14f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/128ee14f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/128ee14f
Branch: refs/heads/0.10.x-branch
Commit: 128ee14ff6f8571c973161805bceadf8cc2cfce8
Parents: 9579c0b
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Mon Jun 8 20:20:42 2015 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Mon Jun 8 20:20:42 2015 -0500
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/converter.clj | 11 +++++++----
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 8 ++++++--
2 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/128ee14f/storm-core/src/clj/backtype/storm/converter.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/converter.clj b/storm-core/src/clj/backtype/storm/converter.clj
index 7bfc14b..63868cd 100644
--- a/storm-core/src/clj/backtype/storm/converter.clj
+++ b/storm-core/src/clj/backtype/storm/converter.clj
@@ -134,10 +134,13 @@
thrift-topology-action-options)))
(defn clojurify-topology-action-options [^TopologyActionOptions topology-action-options]
- (if (and topology-action-options (.is_set_kill_options topology-action-options))
- (clojurify-kill-options (.get_kill_options topology-action-options)))
- (if (and topology-action-options (.is_set_rebalance_options topology-action-options))
- (clojurify-rebalance-options (.get_rebalance_options topology-action-options))))
+ (if topology-action-options
+ (or (and (.is_set_kill_options topology-action-options)
+ (clojurify-kill-options
+ (.get_kill_options topology-action-options)))
+ (and (.is_set_rebalance_options topology-action-options)
+ (clojurify-rebalance-options
+ (.get_rebalance_options topology-action-options))))))
(defn thriftify-storm-base [storm-base]
(doto (StormBase.)
http://git-wip-us.apache.org/repos/asf/storm/blob/128ee14f/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
index b887ce2..40216e8 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -170,7 +170,9 @@
}
:killed {:startup (fn [] (delay-event nimbus
storm-id
- (:delay-secs storm-base)
+ (-> storm-base
+ :topology-action-options
+ :delay-secs)
:remove)
nil)
:kill (kill-transition nimbus storm-id)
@@ -182,7 +184,9 @@
}
:rebalancing {:startup (fn [] (delay-event nimbus
storm-id
- (:delay-secs storm-base)
+ (-> storm-base
+ :topology-action-options
+ :delay-secs)
:do-rebalance)
nil)
:kill (kill-transition nimbus storm-id)
[5/5] storm git commit: [maven-release-plugin] prepare release
v0.10.0-beta
Posted by pt...@apache.org.
[maven-release-plugin] prepare release v0.10.0-beta
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d1e10cee
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d1e10cee
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d1e10cee
Branch: refs/heads/0.10.x-branch
Commit: d1e10ceecba4f87f1e70bf02ec63094eef4f4bb3
Parents: 3d5058d
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jun 9 21:32:25 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jun 9 21:32:25 2015 -0400
----------------------------------------------------------------------
examples/storm-starter/pom.xml | 2 +-
external/flux/flux-core/pom.xml | 2 +-
external/flux/flux-examples/pom.xml | 2 +-
external/flux/flux-wrappers/pom.xml | 2 +-
external/flux/pom.xml | 2 +-
external/storm-eventhubs/pom.xml | 2 +-
external/storm-hbase/pom.xml | 2 +-
external/storm-hdfs/pom.xml | 2 +-
external/storm-hive/pom.xml | 2 +-
external/storm-jdbc/pom.xml | 2 +-
external/storm-kafka/pom.xml | 2 +-
external/storm-redis/pom.xml | 2 +-
pom.xml | 4 ++--
storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
storm-buildtools/storm-maven-plugins/pom.xml | 2 +-
storm-core/pom.xml | 2 +-
storm-dist/binary/pom.xml | 2 +-
storm-dist/source/pom.xml | 2 +-
storm-multilang/javascript/pom.xml | 2 +-
storm-multilang/python/pom.xml | 2 +-
storm-multilang/ruby/pom.xml | 2 +-
21 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/examples/storm-starter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 63e19fc..6a7899a 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/external/flux/flux-core/pom.xml
----------------------------------------------------------------------
diff --git a/external/flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml
index c553242..75ad92e 100644
--- a/external/flux/flux-core/pom.xml
+++ b/external/flux/flux-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.storm</groupId>
<artifactId>flux</artifactId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/external/flux/flux-examples/pom.xml
----------------------------------------------------------------------
diff --git a/external/flux/flux-examples/pom.xml b/external/flux/flux-examples/pom.xml
index 31dad48..30cf913 100644
--- a/external/flux/flux-examples/pom.xml
+++ b/external/flux/flux-examples/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.storm</groupId>
<artifactId>flux</artifactId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/external/flux/flux-wrappers/pom.xml
----------------------------------------------------------------------
diff --git a/external/flux/flux-wrappers/pom.xml b/external/flux/flux-wrappers/pom.xml
index d92b393..e37d1c9 100644
--- a/external/flux/flux-wrappers/pom.xml
+++ b/external/flux/flux-wrappers/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.storm</groupId>
<artifactId>flux</artifactId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/external/flux/pom.xml
----------------------------------------------------------------------
diff --git a/external/flux/pom.xml b/external/flux/pom.xml
index ffb5c07..80fa573 100644
--- a/external/flux/pom.xml
+++ b/external/flux/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/external/storm-eventhubs/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-eventhubs/pom.xml b/external/storm-eventhubs/pom.xml
index a9496d8..bdd1294 100755
--- a/external/storm-eventhubs/pom.xml
+++ b/external/storm-eventhubs/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/external/storm-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index 5aaff3f..5372ec0 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/external/storm-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index c36a7b0..63a7dc1 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/external/storm-hive/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hive/pom.xml b/external/storm-hive/pom.xml
index 98e483d..85b99e5 100644
--- a/external/storm-hive/pom.xml
+++ b/external/storm-hive/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/external/storm-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-jdbc/pom.xml b/external/storm-jdbc/pom.xml
index 9a27a87..1340025 100644
--- a/external/storm-jdbc/pom.xml
+++ b/external/storm-jdbc/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/external/storm-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 7b250f7..2ed253c 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/external/storm-redis/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-redis/pom.xml b/external/storm-redis/pom.xml
index 1958c8f..8a3e8c4 100644
--- a/external/storm-redis/pom.xml
+++ b/external/storm-redis/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 94f978f..44187ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.apache.storm</groupId>
<artifactId>storm</artifactId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<packaging>pom</packaging>
<name>Storm</name>
<description>Distributed and fault-tolerant realtime computation</description>
@@ -175,7 +175,7 @@
<scm>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/storm.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/storm.git</developerConnection>
- <tag>HEAD</tag>
+ <tag>v0.10.0-beta</tag>
<url>https://git-wip-us.apache.org/repos/asf/storm</url>
</scm>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/storm-buildtools/maven-shade-clojure-transformer/pom.xml
----------------------------------------------------------------------
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index 79d9728..874e69a 100644
--- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml
+++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/storm-buildtools/storm-maven-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/storm-buildtools/storm-maven-plugins/pom.xml b/storm-buildtools/storm-maven-plugins/pom.xml
index f873a68..f1d1afd 100644
--- a/storm-buildtools/storm-maven-plugins/pom.xml
+++ b/storm-buildtools/storm-maven-plugins/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.storm</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 0ad59c5..4d17455 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.apache.storm</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/storm-dist/binary/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/pom.xml b/storm-dist/binary/pom.xml
index 9a768f1..2552a33 100644
--- a/storm-dist/binary/pom.xml
+++ b/storm-dist/binary/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.storm</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/storm-dist/source/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/source/pom.xml b/storm-dist/source/pom.xml
index a337b89..9549f98 100644
--- a/storm-dist/source/pom.xml
+++ b/storm-dist/source/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.storm</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/storm-multilang/javascript/pom.xml
----------------------------------------------------------------------
diff --git a/storm-multilang/javascript/pom.xml b/storm-multilang/javascript/pom.xml
index 499a3c1..d8c2ff9 100644
--- a/storm-multilang/javascript/pom.xml
+++ b/storm-multilang/javascript/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.storm</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/storm-multilang/python/pom.xml
----------------------------------------------------------------------
diff --git a/storm-multilang/python/pom.xml b/storm-multilang/python/pom.xml
index 45cd2e1..c4763d5 100644
--- a/storm-multilang/python/pom.xml
+++ b/storm-multilang/python/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.storm</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/d1e10cee/storm-multilang/ruby/pom.xml
----------------------------------------------------------------------
diff --git a/storm-multilang/ruby/pom.xml b/storm-multilang/ruby/pom.xml
index 2da59e8..2e992c7 100644
--- a/storm-multilang/ruby/pom.xml
+++ b/storm-multilang/ruby/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.10.0-beta-SNAPSHOT</version>
+ <version>0.10.0-beta</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.storm</groupId>
[2/5] storm git commit: Merge branch 'storm-856-use-ser-delay-secs'
of github.com:d2r/storm
Posted by pt...@apache.org.
Merge branch 'storm-856-use-ser-delay-secs' of github.com:d2r/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f6e2ad06
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f6e2ad06
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f6e2ad06
Branch: refs/heads/0.10.x-branch
Commit: f6e2ad063c6a9fef98ed2acd1f824a005daae5d1
Parents: 27bc183 128ee14
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jun 9 21:20:10 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jun 9 21:20:10 2015 -0400
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/converter.clj | 11 +++++++----
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 8 ++++++--
2 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[3/5] storm git commit: add STORM-856 to changelog
Posted by pt...@apache.org.
add STORM-856 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/58372f0a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/58372f0a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/58372f0a
Branch: refs/heads/0.10.x-branch
Commit: 58372f0a6313b914065faca7c4aa47d41f1d4f4d
Parents: f6e2ad0
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jun 9 21:20:57 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jun 9 21:20:57 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/58372f0a/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99e8a61..77977e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
## 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
[4/5] storm git commit: Merge branch 'master' into 0.10.x-branch
Posted by pt...@apache.org.
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