Merge branch 'STORM-1602-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/247f7927 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/247f7927 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/247f7927 Branch: refs/heads/1.x-branch Commit: 247f79275341d5d8bb9f2c7d8ebb8457066eedbf Parents: a1a4df7 8965a6c Author: Jungtaek Lim <[email protected]> Authored: Sun Mar 20 11:05:06 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Sun Mar 20 11:05:06 2016 +0900 ---------------------------------------------------------------------- .../clj/org/apache/storm/daemon/supervisor.clj | 6 +- .../org/apache/storm/blobstore/BlobStore.java | 5 + .../apache/storm/blobstore/BlobStoreTest.java | 171 +++++++++---------- .../apache/storm/localizer/LocalizerTest.java | 14 +- 4 files changed, 105 insertions(+), 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/247f7927/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj ----------------------------------------------------------------------
