Merge branch 'STORM-1750' of https://github.com/srdo/storm into STORM-1750
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7b43c2e5 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7b43c2e5 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7b43c2e5 Branch: refs/heads/master Commit: 7b43c2e5fd7852070d9e327e2353b3e65afd94a0 Parents: 171ae26 7f788d1 Author: Jungtaek Lim <[email protected]> Authored: Mon May 16 17:19:15 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Mon May 16 17:19:15 2016 +0900 ---------------------------------------------------------------------- storm-core/src/clj/org/apache/storm/daemon/executor.clj | 5 ++++- .../src/jvm/org/apache/storm/cluster/ZKStateStorage.java | 10 +++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
