Merge branch 'dev-zookeeper' of https://github.com/hustfxj/storm into STORM-1262
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bb60f11c Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bb60f11c Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bb60f11c Branch: refs/heads/master Commit: bb60f11c0cee7698ec77be947b4e707c7ed34c44 Parents: 8aff56f 9f168d2 Author: zhongyan.feng <[email protected]> Authored: Thu Feb 18 19:51:08 2016 +0800 Committer: zhongyan.feng <[email protected]> Committed: Thu Feb 18 19:51:08 2016 +0800 ---------------------------------------------------------------------- bin/storm.cmd | 2 +- bin/storm.py | 2 +- .../org/apache/storm/command/dev_zookeeper.clj | 28 ---------------- .../org/apache/storm/command/DevZookeeper.java | 35 ++++++++++++++++++++ 4 files changed, 37 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/bb60f11c/bin/storm.cmd ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/bb60f11c/bin/storm.py ----------------------------------------------------------------------
