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:54 UTC
[09/18] storm git commit: Merge pull request #18 from apache/master
Merge pull request #18 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/a3602f25
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a3602f25
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a3602f25
Branch: refs/heads/master
Commit: a3602f2552a0c1f88f0323d27076df16a26d09a4
Parents: 503a04b a7c8310
Author: caofangkun <ca...@gmail.com>
Authored: Thu Apr 16 14:52:15 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Thu Apr 16 14:52:15 2015 +0800
----------------------------------------------------------------------
CHANGELOG.md | 9 +
DEVELOPER.md | 4 +-
STORM-UI-REST-API.md | 44 +-
.../storm/starter/bolt/AbstractRankerBolt.java | 4 +-
.../storm/starter/bolt/RollingCountAggBolt.java | 1 -
.../storm/starter/bolt/RollingCountBolt.java | 4 +-
.../jvm/storm/starter/util/TupleHelpers.java | 33 -
.../src/jvm/storm/kafka/bolt/KafkaBolt.java | 5 +
pom.xml | 2 +-
storm-core/pom.xml | 5 -
storm-core/src/clj/backtype/storm/converter.clj | 3 +-
.../src/clj/backtype/storm/daemon/common.clj | 13 -
.../clj/backtype/storm/daemon/supervisor.clj | 51 +-
.../src/clj/backtype/storm/daemon/worker.clj | 14 +-
.../src/clj/backtype/storm/local_state.clj | 99 +++
storm-core/src/clj/backtype/storm/testing.clj | 25 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 13 +-
storm-core/src/clj/backtype/storm/util.clj | 5 -
storm-core/src/jvm/backtype/storm/Config.java | 3 +
.../storm/generated/ClusterWorkerHeartbeat.java | 101 ++-
.../storm/generated/LSApprovedWorkers.java | 458 +++++++++++
.../generated/LSSupervisorAssignments.java | 471 ++++++++++++
.../storm/generated/LSSupervisorId.java | 406 ++++++++++
.../storm/generated/LSWorkerHeartbeat.java | 755 +++++++++++++++++++
.../storm/generated/LocalAssignment.java | 561 ++++++++++++++
.../storm/generated/LocalStateData.java | 471 ++++++++++++
.../storm/generated/ThriftSerializedObject.java | 516 +++++++++++++
.../security/auth/SimpleTransportPlugin.java | 3 +-
.../jvm/backtype/storm/utils/LocalState.java | 163 +++-
.../jvm/backtype/storm/utils/TupleUtils.java | 35 +
.../src/jvm/backtype/storm/utils/Utils.java | 119 +--
.../trident/topology/TridentBoltExecutor.java | 3 +-
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 | 613 ++++++++++++++-
storm-core/src/storm.thrift | 34 +
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 -
.../clj/backtype/storm/local_state_test.clj | 40 +-
.../storm/security/auth/nimbus_auth_test.clj | 2 +-
46 files changed, 4828 insertions(+), 306 deletions(-)
----------------------------------------------------------------------