Merge remote-tracking branch 'upstream/master' into storm-456
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/81a92045 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/81a92045 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/81a92045 Branch: refs/heads/master Commit: 81a92045c2b5ddaabf822211b43c06ea6b60c1d2 Parents: e702656 8e43c25 Author: Parth Brahmbhatt <[email protected]> Authored: Sat Jan 10 13:43:14 2015 -0500 Committer: Parth Brahmbhatt <[email protected]> Committed: Sat Jan 10 13:43:14 2015 -0500 ---------------------------------------------------------------------- CHANGELOG.md | 12 + README.markdown | 2 + SECURITY.md | 25 +- conf/defaults.yaml | 3 +- external/storm-hbase/README.md | 49 +++- external/storm-hbase/pom.xml | 17 +- .../storm/hbase/bolt/AbstractHBaseBolt.java | 9 +- .../apache/storm/hbase/security/AutoHBase.java | 243 ++++++++++++++++ .../storm/hbase/security/HBaseSecurityUtil.java | 32 ++- .../storm/hbase/trident/state/HBaseState.java | 9 +- external/storm-hdfs/README.md | 45 +++ .../storm/hdfs/bolt/format/SequenceFormat.java | 5 +- .../storm/hdfs/common/security/AutoHDFS.java | 281 +++++++++++++++++++ .../hdfs/common/security/HdfsSecurityUtil.java | 30 +- .../src/jvm/storm/kafka/KafkaUtils.java | 12 +- .../src/jvm/storm/kafka/PartitionManager.java | 6 +- .../kafka/TopicOffsetOutOfRangeException.java | 25 ++ .../jvm/storm/kafka/UpdateOffsetException.java | 22 -- .../kafka/trident/TridentKafkaEmitter.java | 43 ++- .../src/test/storm/kafka/KafkaUtilsTest.java | 2 +- .../src/clj/backtype/storm/daemon/logviewer.clj | 27 +- .../src/clj/backtype/storm/daemon/nimbus.clj | 7 +- .../clj/backtype/storm/daemon/supervisor.clj | 4 + storm-core/src/jvm/backtype/storm/Config.java | 34 +-- .../backtype/storm/messaging/netty/Server.java | 2 + .../storm/security/auth/hadoop/AutoHDFS.java | 262 ----------------- .../jvm/backtype/storm/utils/ShellProcess.java | 11 +- .../src/native/worker-launcher/configure.ac | 2 +- .../worker-launcher/impl/worker-launcher.c | 7 +- .../test/clj/backtype/storm/logviewer_test.clj | 47 +++- .../backtype/storm/security/auth/auth_test.clj | 8 +- .../test/clj/backtype/storm/supervisor_test.clj | 36 +-- 32 files changed, 897 insertions(+), 422 deletions(-) ----------------------------------------------------------------------
