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/05/22 21:54:50 UTC
[05/18] storm git commit: Merge pull request #14 from apache/master
Merge pull request #14 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/57a691c8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/57a691c8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/57a691c8
Branch: refs/heads/master
Commit: 57a691c865f764cf331abd2e2e6d27bd320813f8
Parents: 146bd6b bb8d48d
Author: caofangkun <ca...@gmail.com>
Authored: Thu Mar 19 10:01:23 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Thu Mar 19 10:01:23 2015 +0800
----------------------------------------------------------------------
CHANGELOG.md | 1 +
conf/defaults.yaml | 2 +-
storm-core/src/clj/backtype/storm/cluster.clj | 58 +-
storm-core/src/clj/backtype/storm/config.clj | 7 +-
storm-core/src/clj/backtype/storm/converter.clj | 201 +++
.../src/clj/backtype/storm/daemon/common.clj | 10 +-
.../src/clj/backtype/storm/daemon/executor.clj | 4 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 106 +-
.../src/clj/backtype/storm/daemon/worker.clj | 3 +-
storm-core/src/clj/backtype/storm/stats.clj | 78 +-
storm-core/src/clj/backtype/storm/thrift.clj | 17 +-
.../storm/coordination/BatchBoltExecutor.java | 4 +-
.../backtype/storm/generated/Assignment.java | 983 ++++++++++++++
.../storm/generated/ClusterWorkerHeartbeat.java | 673 ++++++++++
.../backtype/storm/generated/ExecutorStats.java | 105 +-
.../jvm/backtype/storm/generated/NodeInfo.java | 556 ++++++++
.../jvm/backtype/storm/generated/StormBase.java | 1211 ++++++++++++++++++
.../storm/generated/SupervisorInfo.java | 1182 +++++++++++++++++
.../storm/generated/TopologyActionOptions.java | 387 ++++++
.../storm/generated/TopologyStatus.java | 68 +
.../DefaultSerializationDelegate.java | 11 +-
.../GzipBridgeSerializationDelegate.java | 7 +-
.../GzipSerializationDelegate.java | 10 +-
.../serialization/SerializationDelegate.java | 2 +-
.../ThriftSerializationDelegate.java | 52 +
.../storm/topology/TopologyBuilder.java | 6 +-
.../jvm/backtype/storm/utils/LocalState.java | 4 +-
.../src/jvm/backtype/storm/utils/Utils.java | 82 +-
storm-core/src/jvm/storm/trident/Stream.java | 2 +-
.../src/jvm/storm/trident/TridentTopology.java | 6 +-
storm-core/src/py/storm/ttypes.py | 827 +++++++++++-
storm-core/src/storm.thrift | 51 +
.../test/clj/backtype/storm/cluster_test.clj | 25 +-
.../test/clj/backtype/storm/nimbus_test.clj | 6 +-
.../GzipBridgeSerializationDelegateTest.java | 6 +-
.../ThriftBridgeSerializationDelegateTest.java | 60 +
36 files changed, 6607 insertions(+), 206 deletions(-)
----------------------------------------------------------------------