You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pa...@apache.org on 2015/11/12 22:06:59 UTC
[7/8] storm git commit: Merge branch 'STORM-1098' of
https://github.com/Parth-Brahmbhatt/incubator-storm into STORM1098
Merge branch 'STORM-1098' of https://github.com/Parth-Brahmbhatt/incubator-storm into STORM1098
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/82c25cab
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/82c25cab
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/82c25cab
Branch: refs/heads/master
Commit: 82c25cab1873eadfbc7cc85bf9a4403158f96ae7
Parents: 1354c40 9e6a3d1
Author: Parth Brahmbhatt <br...@gmail.com>
Authored: Thu Nov 12 12:39:18 2015 -0800
Committer: Parth Brahmbhatt <br...@gmail.com>
Committed: Thu Nov 12 12:39:18 2015 -0800
----------------------------------------------------------------------
.../src/clj/backtype/storm/daemon/nimbus.clj | 86 +++++++++++------
storm-core/src/jvm/backtype/storm/Config.java | 6 ++
.../nimbus/ITopologyActionNotifierPlugin.java | 43 +++++++++
.../test/clj/backtype/storm/nimbus_test.clj | 97 ++++++++++++++------
.../nimbus/InMemoryTopologyActionNotifier.java | 53 +++++++++++
5 files changed, 226 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/82c25cab/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/daemon/nimbus.clj
index cd81a4f,c6db89a..d23da03
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@@ -156,9 -165,8 +165,10 @@@
:id->sched-status (atom {})
:id->resources (atom {})
:cred-renewers (AuthUtils/GetCredentialRenewers conf)
+ :topology-history-lock (Object.)
+ :topo-history-state (nimbus-topo-history-state conf)
:nimbus-autocred-plugins (AuthUtils/getNimbusAutoCredPlugins conf)
+ :nimbus-topology-action-notifier (create-tology-action-notifier conf)
}))
(defn inbox [nimbus]
http://git-wip-us.apache.org/repos/asf/storm/blob/82c25cab/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/82c25cab/storm-core/test/clj/backtype/storm/nimbus_test.clj
----------------------------------------------------------------------