Merge branch 'STORM-1602'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/575203cf Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/575203cf Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/575203cf Branch: refs/heads/master Commit: 575203cf40a6b194f1f24cf9875f0284e42b999d Parents: a726589 8dd66bf Author: Jungtaek Lim <kabh...@gmail.com> Authored: Sun Mar 20 11:07:13 2016 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Sun Mar 20 11:07:13 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 | 7 +- 4 files changed, 98 insertions(+), 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/575203cf/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj ----------------------------------------------------------------------
