You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2018/02/01 14:29:01 UTC
[2/2] storm git commit: Merge branch 'reuse-zk-1.x' of
https://github.com/danny0405/storm into STORM-2901-1.x-merge
Merge branch 'reuse-zk-1.x' of https://github.com/danny0405/storm into STORM-2901-1.x-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/49c2fc39
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/49c2fc39
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/49c2fc39
Branch: refs/heads/1.x-branch
Commit: 49c2fc39fa62467d7fcc4f7e0c2eeec86e5e8d4c
Parents: c1a1511 60dfa7d
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Feb 1 23:21:26 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Feb 1 23:21:26 2018 +0900
----------------------------------------------------------------------
.../apache/storm/command/shell_submission.clj | 7 +++-
.../src/clj/org/apache/storm/daemon/nimbus.clj | 36 ++++++++++++++------
.../src/clj/org/apache/storm/zookeeper.clj | 10 +++---
.../apache/storm/blobstore/BlobStoreUtils.java | 6 ++--
.../storm/blobstore/BlobSynchronizer.java | 16 ++++-----
.../storm/blobstore/KeySequenceNumber.java | 25 +++++---------
.../storm/zookeeper/LeaderElectorImp.java | 3 +-
.../org/apache/storm/zookeeper/Zookeeper.java | 22 ++++++++----
8 files changed, 72 insertions(+), 53 deletions(-)
----------------------------------------------------------------------