Merge branch 'STORM-1750-1.x' of https://github.com/srdo/storm into STORM-1750-1.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/351d7706 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/351d7706 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/351d7706 Branch: refs/heads/1.x-branch Commit: 351d7706cb225235b6490bb1bae79e1ced55f82c Parents: 6ac45df a910e29 Author: Jungtaek Lim <[email protected]> Authored: Mon May 16 17:21:14 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Mon May 16 17:21:14 2016 +0900 ---------------------------------------------------------------------- .../apache/storm/cluster_state/zookeeper_state_factory.clj | 7 +++++-- storm-core/src/clj/org/apache/storm/daemon/executor.clj | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
