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 2015/04/22 22:55:44 UTC
[3/6] storm git commit: Merge remote-tracking branch 'apache/master'
Merge remote-tracking branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/84b5b083
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/84b5b083
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/84b5b083
Branch: refs/heads/master
Commit: 84b5b0831d0089bdc85e08cd02f385e07d203c10
Parents: c106f13 2a45a9a
Author: zhuol <zh...@yahoo-inc.com>
Authored: Wed Apr 15 09:26:13 2015 -0500
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Wed Apr 15 09:26:13 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 4 +
STORM-UI-REST-API.md | 44 +-------
storm-core/pom.xml | 5 -
storm-core/src/clj/backtype/storm/converter.clj | 3 +-
.../clj/backtype/storm/daemon/supervisor.clj | 17 ++--
storm-core/src/clj/backtype/storm/testing.clj | 19 ++--
storm-core/src/clj/backtype/storm/ui/core.clj | 13 +--
storm-core/src/clj/backtype/storm/util.clj | 5 -
.../storm/generated/ClusterWorkerHeartbeat.java | 101 ++++++++++++++++++-
storm-core/src/py/__init__.py | 2 +
storm-core/src/py/storm/DistributedRPC.py | 2 +
.../src/py/storm/DistributedRPCInvocations.py | 2 +
storm-core/src/py/storm/Nimbus.py | 2 +
storm-core/src/py/storm/__init__.py | 2 +
storm-core/src/py/storm/constants.py | 2 +
storm-core/src/py/storm/ttypes.py | 19 +++-
storm-core/src/storm.thrift | 1 +
storm-core/src/ui/public/css/style.css | 4 -
storm-core/src/ui/public/js/script.js | 3 +-
.../public/templates/anti-forgery-template.html | 19 ----
storm-core/src/ui/public/topology.html | 8 --
.../storm/security/auth/nimbus_auth_test.clj | 2 +-
22 files changed, 161 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/84b5b083/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/84b5b083/storm-core/src/clj/backtype/storm/util.clj
----------------------------------------------------------------------