You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by zh...@apache.org on 2016/01/28 18:49:59 UTC
[23/23] storm git commit: Merge branch '1227' of
https://github.com/zhuoliu/storm into STORM-1227
Merge branch '1227' of https://github.com/zhuoliu/storm into STORM-1227
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/09976507
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/09976507
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/09976507
Branch: refs/heads/master
Commit: 0997650733589b201df1d3d79057bca435855680
Parents: d948810 6babd0e
Author: zhuol <zh...@yahoo-inc.com>
Authored: Thu Jan 28 11:21:37 2016 -0600
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Thu Jan 28 11:21:37 2016 -0600
----------------------------------------------------------------------
.../src/clj/org/apache/storm/LocalDRPC.clj | 4 +-
.../src/clj/org/apache/storm/blobstore.clj | 6 +-
.../org/apache/storm/command/config_value.clj | 5 +-
.../org/apache/storm/command/dev_zookeeper.clj | 3 +-
.../org/apache/storm/command/healthcheck.clj | 10 +-
.../clj/org/apache/storm/command/heartbeats.clj | 9 +-
.../org/apache/storm/command/kill_workers.clj | 3 +-
.../apache/storm/command/shell_submission.clj | 3 +-
storm-core/src/clj/org/apache/storm/config.clj | 286 +---------
.../src/clj/org/apache/storm/daemon/common.clj | 10 +-
.../src/clj/org/apache/storm/daemon/drpc.clj | 4 +-
.../clj/org/apache/storm/daemon/executor.clj | 4 +-
.../clj/org/apache/storm/daemon/logviewer.clj | 12 +-
.../src/clj/org/apache/storm/daemon/nimbus.clj | 85 +--
.../clj/org/apache/storm/daemon/supervisor.clj | 156 +++---
.../src/clj/org/apache/storm/daemon/task.clj | 8 +-
.../src/clj/org/apache/storm/daemon/worker.clj | 20 +-
.../org/apache/storm/pacemaker/pacemaker.clj | 4 +-
storm-core/src/clj/org/apache/storm/testing.clj | 12 +-
storm-core/src/clj/org/apache/storm/thrift.clj | 6 +-
storm-core/src/clj/org/apache/storm/ui/core.clj | 4 +-
.../staticmocking/MockedConfigUtils.java | 31 ++
.../jvm/org/apache/storm/utils/ConfigUtils.java | 534 +++++++++++++++++++
.../test/clj/org/apache/storm/cluster_test.clj | 4 +-
.../test/clj/org/apache/storm/drpc_test.clj | 25 +-
.../test/clj/org/apache/storm/nimbus_test.clj | 26 +-
.../storm/security/auth/ThriftClient_test.clj | 5 +-
.../storm/security/auth/ThriftServer_test.clj | 7 +-
.../apache/storm/security/auth/auth_test.clj | 42 +-
.../storm/security/auth/drpc_auth_test.clj | 8 +-
.../storm/security/auth/nimbus_auth_test.clj | 12 +-
.../serialization/SerializationFactory_test.clj | 10 +-
.../clj/org/apache/storm/serialization_test.clj | 3 +-
.../clj/org/apache/storm/supervisor_test.clj | 149 +++---
.../clj/org/apache/storm/transactional_test.clj | 6 +-
.../test/clj/org/apache/storm/utils_test.clj | 3 +-
36 files changed, 926 insertions(+), 593 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/09976507/storm-core/src/clj/org/apache/storm/daemon/executor.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/09976507/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/09976507/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/09976507/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/09976507/storm-core/src/clj/org/apache/storm/daemon/worker.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/09976507/storm-core/src/clj/org/apache/storm/ui/core.clj
----------------------------------------------------------------------