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/08/24 15:52:33 UTC
[48/50] [abbrv] storm git commit: Merge remote-tracking branch
'upstream/master' into ha-merge
Merge remote-tracking branch 'upstream/master' into ha-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/51fdc1a3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/51fdc1a3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/51fdc1a3
Branch: refs/heads/master
Commit: 51fdc1a367dd9b8657c5245726e4edc66925cf6f
Parents: 93dbcaf 9c94188
Author: Parth Brahmbhatt <br...@gmail.com>
Authored: Wed Aug 19 11:03:34 2015 -0700
Committer: Parth Brahmbhatt <br...@gmail.com>
Committed: Wed Aug 19 11:03:34 2015 -0700
----------------------------------------------------------------------
CHANGELOG.md | 11 +
README.markdown | 4 +
SECURITY.md | 2 +-
TODO | 178 ---------
bin/storm-config.cmd | 18 +-
bin/storm.py | 22 +-
conf/defaults.yaml | 3 +
dev-tools/travis/travis-script.sh | 2 +-
docs/documentation/FAQ.md | 7 +-
examples/storm-starter/pom.xml | 29 ++
.../starter/trident/TridentKafkaWordCount.java | 230 +++++++++++
.../flux-core/src/test/resources/log4j2.xml | 34 ++
.../flux-core/src/test/resources/logback.xml | 30 --
external/storm-hdfs/README.md | 9 +
external/storm-hdfs/pom.xml | 11 +
.../apache/storm/hdfs/trident/HdfsState.java | 392 +++++++++++++++----
.../trident/rotation/FileRotationPolicy.java | 14 +
.../rotation/FileSizeRotationPolicy.java | 13 +
.../hdfs/trident/rotation/NoRotationPolicy.java | 10 +
.../trident/rotation/TimedRotationPolicy.java | 31 +-
.../storm/hdfs/trident/HdfsStateTest.java | 206 ++++++++++
external/storm-hive/README.md | 17 +-
.../org/apache/storm/hive/bolt/HiveBolt.java | 39 +-
.../apache/storm/hive/common/HiveOptions.java | 11 +
.../apache/storm/hive/bolt/TestHiveBolt.java | 12 +-
external/storm-jdbc/README.md | 6 +-
.../storm/jdbc/trident/state/JdbcState.java | 2 +-
.../UserPersistanceTridentTopology.java | 2 +-
external/storm-kafka/CHANGELOG.md | 13 -
pom.xml | 2 +-
.../src/clj/backtype/storm/daemon/logviewer.clj | 2 +-
.../clj/backtype/storm/daemon/supervisor.clj | 13 +-
storm-core/src/jvm/backtype/storm/Config.java | 22 +-
.../jvm/backtype/storm/ConfigValidation.java | 13 +-
.../security/auth/SaslTransportPlugin.java | 6 +
.../kerberos/KerberosSaslTransportPlugin.java | 5 +-
.../security/auth/kerberos/NoOpTTrasport.java | 40 ++
.../src/jvm/backtype/storm/task/ShellBolt.java | 8 +-
.../test/clj/backtype/storm/config_test.clj | 4 +-
39 files changed, 1098 insertions(+), 375 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/51fdc1a3/conf/defaults.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/51fdc1a3/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/51fdc1a3/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/51fdc1a3/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------