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/03/11 21:10:13 UTC
[2/6] storm git commit: Merge pull request #5 from apache/master
Merge pull request #5 from apache/master
Merge from apache/storm to caofangkun/apache-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d8c98cb1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d8c98cb1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d8c98cb1
Branch: refs/heads/master
Commit: d8c98cb1846bd07aef558bde410607b923aa5c1e
Parents: 6c04e1b 8491151
Author: caofangkun <ca...@gmail.com>
Authored: Wed Feb 4 09:09:22 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Wed Feb 4 09:09:22 2015 +0800
----------------------------------------------------------------------
CHANGELOG.md | 8 +
README.markdown | 3 +
STORM-UI-REST-API.md | 21 +
docs/README.md | 9 +
docs/documentation/Contributing-to-Storm.md | 2 +-
docs/documentation/Home.md | 2 +-
docs/documentation/Powered-By.md | 4 +-
docs/downloads.html | 3 +
pom.xml | 13 +-
storm-core/pom.xml | 2 +-
storm-core/src/clj/backtype/storm/cluster.clj | 38 +-
.../src/clj/backtype/storm/daemon/logviewer.clj | 5 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 35 +-
.../src/clj/backtype/storm/daemon/worker.clj | 6 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 34 +-
storm-core/src/clj/backtype/storm/util.clj | 6 +-
.../storm/generated/GetInfoOptions.java | 350 +++++++
.../jvm/backtype/storm/generated/Nimbus.java | 974 +++++++++++++++++++
.../storm/generated/NumErrorsChoice.java | 64 ++
.../storm/grouping/PartialKeyGrouping.java | 57 ++
.../src/jvm/backtype/storm/utils/Monitor.java | 8 +-
storm-core/src/py/storm/DistributedRPC-remote | 0
.../py/storm/DistributedRPCInvocations-remote | 0
storm-core/src/py/storm/Nimbus-remote | 7 +
storm-core/src/py/storm/Nimbus.py | 226 +++++
storm-core/src/py/storm/ttypes.py | 80 ++
storm-core/src/storm.thrift | 11 +
.../clj/backtype/storm/integration_test.clj | 10 +-
.../test/clj/backtype/storm/supervisor_test.clj | 4 +-
.../storm/grouping/PartialKeyGroupingTest.java | 46 +
30 files changed, 1985 insertions(+), 43 deletions(-)
----------------------------------------------------------------------