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 2017/02/07 02:27:39 UTC

[05/13] storm git commit: Merge branch 'STORM-2321-1.0.x-merge' into 1.0.x-branch

Merge branch 'STORM-2321-1.0.x-merge' into 1.0.x-branch


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5d1e3802
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5d1e3802
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5d1e3802

Branch: refs/heads/1.0.x-branch
Commit: 5d1e38023101ed45beea45e85fbba34582110f6a
Parents: 07ba34f 3b12349
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Feb 7 10:37:45 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Feb 7 10:37:45 2017 +0900

----------------------------------------------------------------------
 .../src/clj/org/apache/storm/daemon/nimbus.clj  |  6 +++++-
 .../apache/storm/blobstore/BlobStoreUtils.java  |  6 +++++-
 .../storm/blobstore/BlobSynchronizer.java       | 13 +++++++++---
 .../storm/blobstore/KeySequenceNumber.java      | 21 ++++++++++++++------
 .../storm/blobstore/LocalFsBlobStore.java       |  4 +++-
 5 files changed, 38 insertions(+), 12 deletions(-)
----------------------------------------------------------------------