You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by lo...@apache.org on 2016/03/30 09:38:00 UTC
[3/4] storm git commit: Merge branch 'master' into
pacemaker-state-factory-test
Merge branch 'master' into pacemaker-state-factory-test
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ee78943a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ee78943a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ee78943a
Branch: refs/heads/master
Commit: ee78943a886b5858ff23ed1cd8499b86f0897e8b
Parents: 1d7c5e6 6390d18
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Thu Mar 10 23:28:38 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Thu Mar 10 23:28:38 2016 +0800
----------------------------------------------------------------------
CHANGELOG.md | 3 +
conf/log4j2.xml | 2 +-
.../org/apache/storm/starter/ManualDRPC.java | 53 +-
.../src/clj/org/apache/storm/LocalDRPC.clj | 56 --
.../src/clj/org/apache/storm/converter.clj | 15 +
.../src/clj/org/apache/storm/daemon/common.clj | 350 +-----------
.../src/clj/org/apache/storm/daemon/drpc.clj | 215 +-------
.../clj/org/apache/storm/daemon/executor.clj | 24 +-
.../clj/org/apache/storm/daemon/logviewer.clj | 2 +-
.../src/clj/org/apache/storm/daemon/nimbus.clj | 63 +--
.../clj/org/apache/storm/daemon/supervisor.clj | 7 +-
.../src/clj/org/apache/storm/daemon/task.clj | 5 +-
.../src/clj/org/apache/storm/daemon/worker.clj | 24 +-
storm-core/src/clj/org/apache/storm/testing.clj | 100 ++--
.../clj/org/apache/storm/trident/testing.clj | 2 -
storm-core/src/clj/org/apache/storm/ui/core.clj | 15 +-
.../src/jvm/org/apache/storm/LocalDRPC.java | 72 +++
.../org/apache/storm/daemon/DaemonCommon.java | 22 +
.../jvm/org/apache/storm/daemon/DrpcServer.java | 357 ++++++++++++
.../org/apache/storm/daemon/StormCommon.java | 537 +++++++++++++++++++
.../storm/utils/StormCommonInstaller.java | 43 ++
.../src/jvm/org/apache/storm/utils/Utils.java | 16 +
.../org/apache/storm/integration_test.clj | 6 +-
.../test/clj/org/apache/storm/drpc_test.clj | 27 +-
.../test/clj/org/apache/storm/nimbus_test.clj | 121 +++--
.../apache/storm/security/auth/auth_test.clj | 3 +-
.../storm/security/auth/drpc_auth_test.clj | 5 +-
.../clj/org/apache/storm/supervisor_test.clj | 11 +-
28 files changed, 1322 insertions(+), 834 deletions(-)
----------------------------------------------------------------------