You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/11/02 23:19:19 UTC
[12/17] storm git commit: Merge remote-tracking branch
'upstream/master'
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fd70d9ca
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fd70d9ca
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fd70d9ca
Branch: refs/heads/master
Commit: fd70d9ca321184fc5b324e166faf0deedc84c11a
Parents: bdb5e3e 8dd9e6e
Author: Sumit Chawla <su...@gmail.com>
Authored: Sat Sep 26 12:04:29 2015 -0700
Committer: Sumit Chawla <su...@gmail.com>
Committed: Sat Sep 26 12:04:29 2015 -0700
----------------------------------------------------------------------
CHANGELOG.md | 20 +-
DEVELOPER.md | 21 +
README.markdown | 6 +
SECURITY.md | 244 ++--
bin/storm.py | 16 +-
conf/defaults.yaml | 6 +
.../documentation/Setting-up-a-Storm-cluster.md | 10 +-
docs/documentation/Tutorial.md | 2 +-
.../trident/TridentEsTopology.java | 2 +-
.../trident/OpaqueTridentEventHubSpout.java | 2 +-
.../TransactionalTridentEventHubSpout.java | 2 +-
.../org/apache/storm/hbase/common/Utils.java | 10 +-
.../storm/hdfs/trident/FixedBatchSpout.java | 2 +-
.../storm/hive/trident/TridentHiveTopology.java | 2 +-
external/storm-jdbc/README.md | 6 +-
.../src/jvm/storm/kafka/KafkaSpout.java | 11 +-
.../kafka/trident/OpaqueTridentKafkaSpout.java | 6 +-
.../trident/TransactionalTridentKafkaSpout.java | 4 +-
.../src/test/storm/kafka/KafkaUtilsTest.java | 1 +
storm-core/src/clj/backtype/storm/cluster.clj | 50 +-
storm-core/src/clj/backtype/storm/config.clj | 13 +-
storm-core/src/clj/backtype/storm/converter.clj | 23 +-
.../backtype/storm/daemon/builtin_metrics.clj | 25 +-
.../src/clj/backtype/storm/daemon/common.clj | 47 +-
.../src/clj/backtype/storm/daemon/executor.clj | 178 ++-
.../src/clj/backtype/storm/daemon/logviewer.clj | 1 +
.../src/clj/backtype/storm/daemon/nimbus.clj | 29 +-
.../clj/backtype/storm/daemon/supervisor.clj | 2 +-
.../src/clj/backtype/storm/daemon/worker.clj | 117 +-
storm-core/src/clj/backtype/storm/disruptor.clj | 19 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 108 +-
storm-core/src/clj/backtype/storm/util.clj | 16 +-
storm-core/src/jvm/backtype/storm/Config.java | 54 +-
.../coordination/BatchSubtopologyBuilder.java | 4 +-
.../storm/drpc/LinearDRPCTopologyBuilder.java | 7 +-
.../backtype/storm/generated/Assignment.java | 194 +--
.../jvm/backtype/storm/generated/BoltStats.java | 342 ++---
.../storm/generated/ClusterWorkerHeartbeat.java | 55 +-
.../backtype/storm/generated/Credentials.java | 46 +-
.../backtype/storm/generated/DebugOptions.java | 506 +++++++
.../backtype/storm/generated/ExecutorStats.java | 162 +--
.../storm/generated/LSApprovedWorkers.java | 46 +-
.../generated/LSSupervisorAssignments.java | 50 +-
.../storm/generated/LSWorkerHeartbeat.java | 38 +-
.../storm/generated/LocalAssignment.java | 38 +-
.../storm/generated/LocalStateData.java | 50 +-
.../jvm/backtype/storm/generated/Nimbus.java | 1305 +++++++++++++++++-
.../jvm/backtype/storm/generated/NodeInfo.java | 34 +-
.../storm/generated/RebalanceOptions.java | 46 +-
.../backtype/storm/generated/SpoutStats.java | 226 +--
.../jvm/backtype/storm/generated/StormBase.java | 225 ++-
.../storm/generated/SupervisorInfo.java | 110 +-
.../backtype/storm/generated/TopologyInfo.java | 259 +++-
.../backtype/storm/messaging/netty/Client.java | 2 +-
.../backtype/storm/metric/EventLoggerBolt.java | 58 +
.../storm/metric/FileBasedEventLogger.java | 105 ++
.../jvm/backtype/storm/metric/IEventLogger.java | 59 +
.../jvm/backtype/storm/metric/SystemBolt.java | 15 +
.../security/auth/ShellBasedGroupsMapping.java | 2 +-
.../topology/BaseConfigurationDeclarer.java | 2 +-
.../ComponentConfigurationDeclarer.java | 2 +-
.../storm/topology/TopologyBuilder.java | 34 +-
.../TransactionalTopologyBuilder.java | 10 +-
.../utils/DisruptorBackpressureCallback.java | 27 +
.../backtype/storm/utils/DisruptorQueue.java | 101 +-
.../jvm/backtype/storm/utils/RateTracker.java | 119 ++
.../storm/utils/WorkerBackpressureCallback.java | 26 +
.../storm/utils/WorkerBackpressureThread.java | 59 +
.../storm/trident/spout/BatchSpoutExecutor.java | 2 +-
.../jvm/storm/trident/spout/IBatchSpout.java | 2 +-
.../spout/IOpaquePartitionedTridentSpout.java | 2 +-
.../trident/spout/IPartitionedTridentSpout.java | 2 +-
.../jvm/storm/trident/spout/ITridentSpout.java | 2 +-
.../trident/spout/RichSpoutBatchExecutor.java | 2 +-
.../storm/trident/testing/FeederBatchSpout.java | 2 +-
.../testing/FeederCommitterBatchSpout.java | 2 +-
.../storm/trident/testing/FixedBatchSpout.java | 2 +-
.../topology/TridentTopologyBuilder.java | 18 +-
storm-core/src/py/storm/Nimbus-remote | 7 +
storm-core/src/py/storm/Nimbus.py | 263 ++++
storm-core/src/py/storm/ttypes.py | 425 ++++--
storm-core/src/storm.thrift | 14 +
storm-core/src/ui/public/component.html | 8 +
storm-core/src/ui/public/js/script.js | 78 +-
.../templates/component-page-template.html | 13 +
.../templates/topology-page-template.html | 10 +-
storm-core/src/ui/public/topology.html | 3 +-
.../test/clj/backtype/storm/cluster_test.clj | 4 +-
.../test/clj/backtype/storm/config_test.clj | 28 +-
.../test/clj/backtype/storm/nimbus_test.clj | 72 +-
.../storm/topology/TopologyBuilderTest.java | 48 +
.../utils/DisruptorQueueBackpressureTest.java | 115 ++
.../backtype/storm/utils/RateTrackerTest.java | 62 +
93 files changed, 5300 insertions(+), 1305 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fd70d9ca/external/storm-kafka/src/jvm/storm/kafka/KafkaSpout.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fd70d9ca/external/storm-kafka/src/jvm/storm/kafka/trident/OpaqueTridentKafkaSpout.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fd70d9ca/external/storm-kafka/src/test/storm/kafka/KafkaUtilsTest.java
----------------------------------------------------------------------