Merge remote-tracking branch 'apache/master'
Conflicts:
README.markdown
external/storm-kafka/README.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/55c2a84d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/55c2a84d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/55c2a84d
Branch: refs/heads/master
Commit: 55c2a84db3cb4f2a2fd7edb8c8b48f19cadd90f2
Parents: 9583fea c064dba
Author: Rick Kilgore <[email protected]>
Authored: Wed Dec 3 11:59:19 2014 -0800
Committer: Rick Kilgore <[email protected]>
Committed: Wed Dec 3 11:59:19 2014 -0800
----------------------------------------------------------------------
CHANGELOG.md | 7 +++++-
README.markdown | 2 ++
conf/defaults.yaml | 1 +
doap_Storm.rdf | 4 ++--
.../multilang/resources/asyncSplitsentence.js | 18 +++++++++++++++
.../multilang/resources/randomsentence.js | 18 +++++++++++++++
.../multilang/resources/splitsentence.js | 18 +++++++++++++++
.../storm-starter/multilang/resources/storm.js | 18 +++++++++++++++
external/storm-hbase/pom.xml | 1 -
.../trident/mapper/TridentHBaseMapper.java | 18 +++++++++++++++
.../hbase/trident/state/HBaseMapState.java | 17 ++++++++++++++
.../hdfs/bolt/format/DefaultSequenceFormat.java | 17 ++++++++++++++
.../storm/hdfs/bolt/format/SequenceFormat.java | 17 ++++++++++++++
.../hdfs/bolt/rotation/TimedRotationPolicy.java | 17 ++++++++++++++
.../hdfs/common/rotation/MoveFileAction.java | 17 ++++++++++++++
.../hdfs/common/rotation/RotationAction.java | 17 ++++++++++++++
.../apache/storm/hdfs/trident/HdfsState.java | 17 ++++++++++++++
.../storm/hdfs/trident/HdfsStateFactory.java | 17 ++++++++++++++
.../apache/storm/hdfs/trident/HdfsUpdater.java | 17 ++++++++++++++
.../trident/format/DefaultSequenceFormat.java | 17 ++++++++++++++
.../hdfs/trident/format/SequenceFormat.java | 17 ++++++++++++++
.../trident/rotation/TimedRotationPolicy.java | 17 ++++++++++++++
.../storm/hdfs/trident/FixedBatchSpout.java | 17 ++++++++++++++
.../storm/hdfs/trident/TridentFileTopology.java | 17 ++++++++++++++
.../hdfs/trident/TridentSequenceTopology.java | 17 ++++++++++++++
external/storm-kafka/README.md | 2 +-
.../jvm/storm/kafka/UpdateOffsetException.java | 17 ++++++++++++++
pom.xml | 11 ++++++---
.../src/clj/backtype/storm/daemon/executor.clj | 4 ++--
storm-core/src/clj/backtype/storm/testing4j.clj | 23 +++++++++++--------
storm-core/src/dev/resources/storm.js | 18 +++++++++++++++
storm-core/src/dev/resources/tester_bolt.js | 17 ++++++++++++++
storm-core/src/dev/resources/tester_spout.js | 17 ++++++++++++++
storm-core/src/jvm/backtype/storm/Config.java | 10 ++++++++
.../auth/authorizer/SimpleACLAuthorizer.java | 2 +-
.../storm/testing/CompleteTopologyParam.java | 22 +++++++++++++++++-
.../storm/testing/PythonShellMetricsBolt.java | 17 ++++++++++++++
.../storm/testing/PythonShellMetricsSpout.java | 17 ++++++++++++++
.../storm/ui/InvalidRequestException.java | 17 ++++++++++++++
storm-core/src/multilang/js/storm.js | 19 ++++++++++++++-
storm-core/src/ui/public/favicon.ico | Bin 0 -> 18280 bytes
41 files changed, 550 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/55c2a84d/README.markdown
----------------------------------------------------------------------
diff --cc README.markdown
index 337cd49,1077bd6..946bf28
--- a/README.markdown
+++ b/README.markdown
@@@ -177,7 -177,8 +177,9 @@@ under the License
* Dane Hammer ([@danehammer](https://github.com/danehammer))
* Christophe Carre' ([@chrisz](https://github.com/chrisz))
* Anya Tchernishov ([@anyatch](https://github.com/anyatch))
+ * Ahmet DAL ([@javrasya](https://github.com/javrasya))
+ * Kai Sasaki ([@Lewuathe](https://github.com/Lewuathe))
+* Rick Kilgore ([@rick-kilgore](http://github.com/rick-kilgore))
## Acknowledgements
http://git-wip-us.apache.org/repos/asf/storm/blob/55c2a84d/external/storm-kafka/README.md
----------------------------------------------------------------------
