You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/05/20 19:47:25 UTC
[2/5] git commit: Merge branch 'apache-master' into zk-hb-blocks
Merge branch 'apache-master' into zk-hb-blocks
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/865756d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/865756d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/865756d9
Branch: refs/heads/master
Commit: 865756d969dfbda02925bc9d650a526f17c3bbbc
Parents: 0666c41 222c725
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu May 15 17:47:56 2014 +0000
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu May 15 17:47:56 2014 +0000
----------------------------------------------------------------------
CHANGELOG.md | 12 +
DEVELOPER.md | 313 +++++++++++++++++++
README.markdown | 3 +
SECURITY.md | 74 +++++
examples/storm-starter/pom.xml | 5 +
.../jvm/storm/starter/BasicDRPCTopology.java | 2 +-
.../jvm/storm/starter/ExclamationTopology.java | 2 +-
.../jvm/storm/starter/PrintSampleStream.java | 24 +-
.../src/jvm/storm/starter/ReachTopology.java | 2 +-
.../jvm/storm/starter/WordCountTopology.java | 2 +-
.../storm/starter/spout/TwitterSampleSpout.java | 222 +++++++------
.../storm/starter/trident/TridentWordCount.java | 2 +-
.../src/test/storm/kafka/KafkaTestBroker.java | 41 ++-
.../src/test/storm/kafka/KafkaUtilsTest.java | 8 +-
.../src/test/storm/kafka/ZkCoordinatorTest.java | 2 +-
logback/cluster.xml | 2 +-
pom.xml | 2 +-
.../clj/backtype/storm/command/rebalance.clj | 7 +-
.../src/clj/backtype/storm/daemon/logviewer.clj | 29 +-
storm-core/src/clj/backtype/storm/testing.clj | 5 +-
.../src/jvm/backtype/storm/StormSubmitter.java | 152 ++++++++-
.../backtype/storm/task/TopologyContext.java | 11 +-
.../jvm/storm/trident/util/TridentUtils.java | 14 +-
storm-dist/binary/pom.xml | 40 +--
storm-dist/binary/src/main/assembly/binary.xml | 5 +
storm-dist/source/pom.xml | 38 +--
26 files changed, 824 insertions(+), 195 deletions(-)
----------------------------------------------------------------------