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/01/14 17:05:47 UTC
[26/44] storm git commit: Merge branch 'master' into retries
Merge branch 'master' into retries
Conflicts:
README.markdown
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3cda45d5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3cda45d5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3cda45d5
Branch: refs/heads/master
Commit: 3cda45d5045eafc35a9aaa4136681fe5628360de
Parents: 77c2df2 ed59348
Author: Rick Kilgore <ri...@hbo.com>
Authored: Wed Oct 1 13:29:19 2014 -0700
Committer: Rick Kilgore <ri...@hbo.com>
Committed: Wed Oct 1 13:29:19 2014 -0700
----------------------------------------------------------------------
CHANGELOG.md | 6 +
DEVELOPER.md | 28 +-
LICENSE | 25 ++
README.markdown | 5 +
dev-tools/jira-github-join.py | 2 +-
.../multilang/resources/asyncSplitsentence.js | 32 ++
.../multilang/resources/randomsentence.js | 75 ++++
.../multilang/resources/splitsentence.js | 26 ++
.../storm-starter/multilang/resources/storm.js | 349 +++++++++++++++++++
examples/storm-starter/pom.xml | 6 +-
.../storm/starter/WordCountTopologyNode.java | 121 +++++++
external/storm-hdfs/pom.xml | 6 +-
external/storm-kafka/pom.xml | 20 +-
.../jvm/storm/kafka/DynamicBrokersReader.java | 2 +-
.../storm/kafka/DynamicBrokersReaderTest.java | 1 +
pom.xml | 23 +-
.../maven-shade-clojure-transformer/pom.xml | 6 +-
storm-core/pom.xml | 6 +-
.../clj/backtype/storm/daemon/supervisor.clj | 4 +
storm-core/src/dev/resources/storm.js | 349 +++++++++++++++++++
storm-core/src/dev/resources/tester_bolt.js | 27 ++
storm-core/src/dev/resources/tester_spout.js | 58 +++
.../src/jvm/backtype/storm/StormSubmitter.java | 16 +
storm-core/src/ui/public/component.html | 5 +
storm-core/src/ui/public/images/spinner.gif | Bin 0 -> 23470 bytes
storm-core/src/ui/public/index.html | 5 +
.../src/ui/public/js/jquery.blockUI.min.js | 6 +
storm-core/src/ui/public/js/script.js | 11 +
storm-core/src/ui/public/js/visualization.js | 16 +-
storm-core/src/ui/public/topology.html | 5 +
.../test/clj/backtype/storm/multilang_test.clj | 55 ++-
.../test/clj/backtype/storm/supervisor_test.clj | 2 +
storm-dist/binary/pom.xml | 6 +-
storm-dist/source/pom.xml | 6 +-
34 files changed, 1236 insertions(+), 74 deletions(-)
----------------------------------------------------------------------