You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by je...@apache.org on 2016/03/17 04:29:53 UTC
[1/3] storm git commit: fix bug about nimbus.clj
Repository: storm
Updated Branches:
refs/heads/master 413c74013 -> 50701df4a
fix bug about nimbus.clj
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6d59676a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6d59676a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6d59676a
Branch: refs/heads/master
Commit: 6d59676acb2789238fddbe8d84830abda8a6038b
Parents: c2cf3be
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Mon Mar 14 21:23:06 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Mon Mar 14 21:23:06 2016 +0800
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6d59676a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
index e6fd0a2..5820ee9 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
@@ -1353,8 +1353,8 @@
(str "Failed to submit topology. Topology requests more than " workers-allowed " workers."))))))
(defn nimbus-topology-bases [storm-cluster-state]
- map-val #(clojurify-storm-base %) (clojurify-structure
- (StormCommon/topologyBases storm-cluster-state)))
+ (map-val #(clojurify-storm-base %) (clojurify-structure
+ (StormCommon/topologyBases storm-cluster-state))))
(defn- set-logger-timeouts [log-config]
(let [timeout-secs (.get_reset_log_level_timeout_secs log-config)
[3/3] storm git commit: Added STORM-1623 to CHANGELOG
Posted by je...@apache.org.
Added STORM-1623 to CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/50701df4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/50701df4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/50701df4
Branch: refs/heads/master
Commit: 50701df4ae3249e43200eaa9803e471cf7513543
Parents: 0893c81
Author: Boyang Jerry Peng <je...@yahoo-inc.com>
Authored: Wed Mar 16 22:16:06 2016 -0500
Committer: Boyang Jerry Peng <je...@yahoo-inc.com>
Committed: Wed Mar 16 22:16:06 2016 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/50701df4/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 901f735..0ea7a8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 2.0.0
+ * STORM-1623: nimbus.clj's minor bug
* STORM-1624: Add maven central status in README
* STORM-1232: port backtype.storm.scheduler.DefaultScheduler to java
* STORM-1231: port backtype.storm.scheduler.EvenScheduler to java
[2/3] storm git commit: Merge branch 'nimbus-bug' of
https://github.com/hustfxj/storm
Posted by je...@apache.org.
Merge branch 'nimbus-bug' of https://github.com/hustfxj/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0893c81a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0893c81a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0893c81a
Branch: refs/heads/master
Commit: 0893c81af1511ff1643f32e68fd7a6aa6ae38934
Parents: 413c740 6d59676
Author: Boyang Jerry Peng <je...@yahoo-inc.com>
Authored: Wed Mar 16 22:14:58 2016 -0500
Committer: Boyang Jerry Peng <je...@yahoo-inc.com>
Committed: Wed Mar 16 22:14:58 2016 -0500
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0893c81a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------