You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2015/08/25 05:05:23 UTC
[05/11] storm git commit: Merge remote-tracking branch
'upstream/master'
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4262a194
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4262a194
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4262a194
Branch: refs/heads/master
Commit: 4262a194a41ab871bac8d9380d9506913601d0fa
Parents: 84a282c 87fc298
Author: rohan_agarwal <ro...@gmail.com>
Authored: Mon Aug 17 10:38:02 2015 +0530
Committer: rohan_agarwal <ro...@gmail.com>
Committed: Mon Aug 17 10:38:02 2015 +0530
----------------------------------------------------------------------
CHANGELOG.md | 9 +
README.markdown | 3 +
conf/defaults.yaml | 1 +
dev-tools/travis/travis-script.sh | 2 +-
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 +-
external/storm-hive/pom.xml | 24 ++
.../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 +-
.../clj/backtype/storm/daemon/supervisor.clj | 4 +-
storm-core/src/jvm/backtype/storm/Config.java | 8 +-
.../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 +-
28 files changed, 778 insertions(+), 124 deletions(-)
----------------------------------------------------------------------