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 2016/12/03 02:09:02 UTC

[2/3] storm git commit: Merge branch 'STORM-2215-1.x-merge' into 1.x-branch

Merge branch 'STORM-2215-1.x-merge' 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/aa375f50
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/aa375f50
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/aa375f50

Branch: refs/heads/1.x-branch
Commit: aa375f50c258ac45cc7ddfabc9a5310e21daf1f6
Parents: f43dabf 96b6f60
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Dec 3 11:08:12 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Dec 3 11:08:12 2016 +0900

----------------------------------------------------------------------
 .../src/clj/org/apache/storm/daemon/nimbus.clj  |  9 ++++++---
 .../jvm/org/apache/storm/StormSubmitter.java    | 16 +++++++++++++--
 .../apache/storm/blobstore/NimbusBlobStore.java |  7 ++++++-
 .../src/jvm/org/apache/storm/utils/Utils.java   | 21 ++++++++++++++++++++
 .../org/apache/storm/TestConfigValidate.java    | 17 ++++++++++++++++
 5 files changed, 64 insertions(+), 6 deletions(-)
----------------------------------------------------------------------