Merge branch 'STORM-1125' of https://github.com/kishorvpatil/incubator-storm into STORM-1125
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9e859238 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9e859238 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9e859238 Branch: refs/heads/master Commit: 9e859238b3b647d834319e43a46684659178a05e Parents: 8c3fc55 9ad2774 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Sat Oct 24 10:10:50 2015 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Sat Oct 24 10:10:50 2015 +0900 ---------------------------------------------------------------------- storm-core/src/clj/backtype/storm/cluster.clj | 69 ++++++++++++-------- .../src/clj/backtype/storm/daemon/nimbus.clj | 2 +- 2 files changed, 43 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/9e859238/storm-core/src/clj/backtype/storm/daemon/nimbus.clj ----------------------------------------------------------------------
