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/27 19:55:41 UTC
[4/7] storm git commit: Merge branch 'master' into travis
Merge branch 'master' into travis
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ea609945
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ea609945
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ea609945
Branch: refs/heads/master
Commit: ea6099458d3b79a503178bbc08d2022e00b602a6
Parents: 517342b 37a7e8b
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Apr 24 06:58:52 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Apr 24 06:58:52 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 32 +
DEVELOPER.md | 4 +-
LICENSE | 29 +
README.markdown | 1 +
STORM-UI-REST-API.md | 54 +-
bin/storm.py | 24 +-
conf/defaults.yaml | 2 +-
dev-tools/test-ns.py | 19 +-
docs/documentation/Multilang-protocol.md | 63 +-
docs/documentation/Trident-API-Overview.md | 2 +-
examples/storm-starter/README.markdown | 8 +-
.../storm-starter/multilang/resources/storm.js | 373 ---------
.../storm-starter/multilang/resources/storm.py | 260 -------
.../storm-starter/multilang/resources/storm.rb | 236 ------
examples/storm-starter/pom.xml | 67 +-
.../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 -
.../org/apache/storm/hbase/bolt/HBaseBolt.java | 2 +-
.../storm/hbase/bolt/HBaseLookupBolt.java | 4 +-
.../hbase/trident/state/HBaseMapState.java | 2 +
.../storm/hbase/trident/state/HBaseState.java | 2 +-
.../org/apache/storm/hdfs/bolt/HdfsBolt.java | 2 +-
.../storm/hdfs/bolt/SequenceFileBolt.java | 2 +-
external/storm-kafka/README.md | 44 +-
.../src/jvm/storm/kafka/KafkaConfig.java | 2 +-
.../src/jvm/storm/kafka/KafkaUtils.java | 21 +-
.../src/jvm/storm/kafka/PartitionManager.java | 4 +-
.../src/jvm/storm/kafka/bolt/KafkaBolt.java | 6 +
.../kafka/trident/TridentKafkaEmitter.java | 4 +-
.../src/test/storm/kafka/KafkaUtilsTest.java | 6 +-
.../test/storm/kafka/bolt/KafkaBoltTest.java | 27 +
external/storm-redis/README.md | 108 ++-
external/storm-redis/pom.xml | 2 +-
.../redis/common/container/JedisContainer.java | 7 +-
.../redis/trident/state/RedisMapState.java | 10 +-
.../redis/topology/PersistentWordCount.java | 35 -
pom.xml | 5 +-
storm-core/pom.xml | 40 +-
storm-core/src/clj/backtype/storm/cluster.clj | 5 +-
storm-core/src/clj/backtype/storm/converter.clj | 10 +-
.../src/clj/backtype/storm/daemon/common.clj | 15 +-
.../src/clj/backtype/storm/daemon/executor.clj | 9 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 8 +-
.../clj/backtype/storm/daemon/supervisor.clj | 57 +-
.../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 | 80 +-
.../src/clj/backtype/storm/ui/helpers.clj | 15 +-
storm-core/src/clj/backtype/storm/util.clj | 23 +-
storm-core/src/dev/resources/storm.js | 373 ---------
storm-core/src/dev/resources/storm.py | 260 -------
storm-core/src/dev/resources/storm.rb | 236 ------
storm-core/src/jvm/backtype/storm/Config.java | 9 +
.../storm/generated/ClusterWorkerHeartbeat.java | 102 ++-
.../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 ++++++++++++
.../jvm/backtype/storm/generated/Nimbus.java | 12 +-
.../storm/generated/SupervisorInfo.java | 116 ++-
.../storm/generated/SupervisorSummary.java | 117 ++-
.../storm/generated/ThriftSerializedObject.java | 516 +++++++++++++
.../storm/generated/TopologySummary.java | 2 +-
.../security/auth/SimpleTransportPlugin.java | 3 +-
.../GzipBridgeThriftSerializationDelegate.java | 64 ++
.../GzipThriftSerializationDelegate.java | 57 ++
.../src/jvm/backtype/storm/task/ShellBolt.java | 5 +-
.../backtype/storm/task/TopologyContext.java | 104 ++-
.../jvm/backtype/storm/utils/LocalState.java | 163 +++-
.../jvm/backtype/storm/utils/NimbusClient.java | 7 +
.../jvm/backtype/storm/utils/TupleUtils.java | 35 +
.../src/jvm/backtype/storm/utils/Utils.java | 151 ++--
.../trident/topology/TridentBoltExecutor.java | 3 +-
storm-core/src/multilang/js/storm.js | 366 ---------
storm-core/src/multilang/py/storm.py | 260 -------
storm-core/src/multilang/rb/storm.rb | 236 ------
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 | 10 +
storm-core/src/py/storm/__init__.py | 2 +
storm-core/src/py/storm/constants.py | 2 +
storm-core/src/py/storm/ttypes.py | 645 +++++++++++++++-
storm-core/src/storm.thrift | 43 ++
.../src/ui/public/css/jsonFormatter.min.css | 1 +
storm-core/src/ui/public/css/style.css | 15 +-
storm-core/src/ui/public/index.html | 3 +
.../src/ui/public/js/jsonFormatter.min.js | 2 +
storm-core/src/ui/public/js/script.js | 5 +-
.../public/templates/anti-forgery-template.html | 19 -
.../templates/component-page-template.html | 2 +-
.../public/templates/index-page-template.html | 6 +
storm-core/src/ui/public/topology.html | 11 +-
.../test/clj/backtype/storm/cluster_test.clj | 4 +-
.../clj/backtype/storm/local_state_test.clj | 40 +-
.../storm/security/auth/nimbus_auth_test.clj | 233 +++---
.../clj/backtype/storm/transactional_test.clj | 6 +-
...ipBridgeThriftSerializationDelegateTest.java | 71 ++
storm-dist/binary/src/main/assembly/binary.xml | 18 +
storm-multilang/javascript/pom.xml | 32 +
.../src/main/resources/resources/storm.js | 373 +++++++++
storm-multilang/python/pom.xml | 32 +
.../src/main/resources/resources/storm.py | 260 +++++++
storm-multilang/ruby/pom.xml | 32 +
.../ruby/src/main/resources/resources/storm.rb | 236 ++++++
110 files changed, 7131 insertions(+), 3208 deletions(-)
----------------------------------------------------------------------