You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@storm.apache.org by bo...@apache.org on 2016/03/07 20:03:32 UTC

[4/6] storm git commit: upmerge from master

upmerge from master


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

Branch: refs/heads/master
Commit: 6bcdac3f2009bd9bbd19acc866f0db0b838c8f9f
Parents: 68e5d03 df54280
Author: 卫乐 <we...@taobao.com>
Authored: Thu Mar 3 09:58:22 2016 +0800
Committer: 卫乐 <we...@taobao.com>
Committed: Thu Mar 3 09:58:22 2016 +0800

----------------------------------------------------------------------
 .gitignore                                      |  1 +
 CHANGELOG.md                                    |  2 ++
 pom.xml                                         | 23 ++++++++++++++++++++
 .../jvm/org/apache/storm/utils/ConfigUtils.java |  6 +++--
 .../src/jvm/org/apache/storm/utils/Utils.java   |  9 ++------
 .../clj/org/apache/storm/supervisor_test.clj    | 11 ++++++----
 6 files changed, 39 insertions(+), 13 deletions(-)
----------------------------------------------------------------------