Merge branch 'STORM-1520' of https://github.com/HeartSaVioR/storm into STORM-1520
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7ddbb9f7 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7ddbb9f7 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7ddbb9f7 Branch: refs/heads/master Commit: 7ddbb9f74bf29e887842b0455b0b5f418c66b001 Parents: b89af96 0025647 Author: Jungtaek Lim <[email protected]> Authored: Tue Feb 9 11:20:42 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Tue Feb 9 11:20:42 2016 +0900 ---------------------------------------------------------------------- .../cluster_state/zookeeper_state_factory.clj | 3 +- .../utils/StormConnectionStateConverter.java | 44 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
