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:06:02 UTC
[41/44] storm git commit: Merge branch 'master' into retries
Merge branch 'master' into retries
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f99fe8ee
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f99fe8ee
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f99fe8ee
Branch: refs/heads/master
Commit: f99fe8ee38249951688d11c8dc93d39d24c6b0ac
Parents: 4be9e52 55c2a84
Author: Rick Kilgore <ri...@hbo.com>
Authored: Wed Dec 3 11:59:37 2014 -0800
Committer: Rick Kilgore <ri...@hbo.com>
Committed: Wed Dec 3 11:59:37 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(-)
----------------------------------------------------------------------