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:46 UTC
[25/44] storm git commit: Merge remote-tracking branch 'apache/master'
Merge remote-tracking branch 'apache/master'
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/ed593480
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ed593480
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ed593480
Branch: refs/heads/master
Commit: ed593480ba543127c9491b5beab68ca49c6bd9a1
Parents: 36c5dc5 a56ccc7
Author: Rick Kilgore <ri...@hbo.com>
Authored: Fri Sep 26 16:10:49 2014 -0700
Committer: Rick Kilgore <ri...@hbo.com>
Committed: Fri Sep 26 16:10:49 2014 -0700
----------------------------------------------------------------------
CHANGELOG.md | 6 +
DEVELOPER.md | 28 +-
LICENSE | 25 ++
README.markdown | 3 +
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 +++++++++++++++++++
.../storm/starter/WordCountTopologyNode.java | 121 +++++++
.../jvm/storm/kafka/DynamicBrokersReader.java | 2 +-
.../storm/kafka/DynamicBrokersReaderTest.java | 1 +
.../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 +
26 files changed, 1179 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ed593480/README.markdown
----------------------------------------------------------------------
diff --cc README.markdown
index ff6f8c7,5fe638e..d0cfd69
--- a/README.markdown
+++ b/README.markdown
@@@ -173,7 -172,8 +174,9 @@@ under the License
* Dave Golombek ([@dgolombek](https://github.com/dgolombek))
* Edison Xu ([@EdisonXu](https://github.com/EdisonXu))
* Ariel Valentin ([@arielvalentin](http://blog.arielvalentin.com/))
+ * Dane Hammer ([@danehammer](https://github.com/danehammer))
+ * Christophe Carre' ([@chrisz](https://github.com/chrisz))
+* Rick Kilgore ([@rick-kilgore](http://github.com/rick-kilgore))
## Acknowledgements