Merge branch 'STORM-1520-1.x' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d8d8e696 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d8d8e696 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d8d8e696 Branch: refs/heads/1.x-branch Commit: d8d8e696b539597dd0b5be82dff5e89643181c0e Parents: 0164e52 ed4a55f Author: Jungtaek Lim <[email protected]> Authored: Tue Feb 9 11:37:54 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Tue Feb 9 11:37:54 2016 +0900 ---------------------------------------------------------------------- .../cluster_state/zookeeper_state_factory.clj | 3 +- .../utils/StormConnectionStateConverter.java | 44 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
