You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/01/30 19:47:52 UTC
[13/14] storm git commit: Merge branch 'zookeeper' of
https://github.com/hustfxj/storm into STORM-1257
Merge branch 'zookeeper' of https://github.com/hustfxj/storm into STORM-1257
STORM-1257: port backtype.storm.zookeeper to java
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c2f11811
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c2f11811
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c2f11811
Branch: refs/heads/master
Commit: c2f118112cd3b0727e30d2512cbd1d33fe9571cb
Parents: 0997650 9442b4a
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Sat Jan 30 12:36:04 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Sat Jan 30 12:36:04 2016 -0600
----------------------------------------------------------------------
.../cluster_state/zookeeper_state_factory.clj | 56 +--
.../org/apache/storm/command/dev_zookeeper.clj | 3 +-
.../apache/storm/command/shell_submission.clj | 5 +-
.../src/clj/org/apache/storm/daemon/nimbus.clj | 3 +-
storm-core/src/clj/org/apache/storm/testing.clj | 11 +-
.../src/clj/org/apache/storm/zookeeper.clj | 253 +----------
.../jvm/org/apache/storm/callback/Callback.java | 23 +
.../storm/callback/DefaultWatcherCallBack.java | 35 ++
.../apache/storm/callback/WatcherCallBack.java | 24 ++
.../org/apache/storm/nimbus/ILeaderElector.java | 6 +-
.../testing/staticmocking/MockedZookeeper.java | 31 ++
.../src/jvm/org/apache/storm/utils/Utils.java | 36 +-
.../storm/zookeeper/LeaderElectorImp.java | 121 ++++++
.../apache/storm/zookeeper/ZkEventTypes.java | 43 ++
.../apache/storm/zookeeper/ZkKeeperStates.java | 41 ++
.../org/apache/storm/zookeeper/Zookeeper.java | 430 +++++++++++++++++++
.../test/clj/org/apache/storm/cluster_test.clj | 39 +-
.../test/clj/org/apache/storm/nimbus_test.clj | 20 +-
.../apache/storm/blobstore/BlobStoreTest.java | 1 +
19 files changed, 853 insertions(+), 328 deletions(-)
----------------------------------------------------------------------