Merge remote-tracking branch 'upstream/master' into STORM-616
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cd96dd0f Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cd96dd0f Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cd96dd0f Branch: refs/heads/master Commit: cd96dd0f29cee69747124373c9c58ed135ed0b4a Parents: ca235e6 e71e2a3 Author: Parth Brahmbhatt <[email protected]> Authored: Tue Jan 6 17:44:28 2015 -0500 Committer: Parth Brahmbhatt <[email protected]> Committed: Tue Jan 6 17:44:28 2015 -0500 ---------------------------------------------------------------------- CHANGELOG.md | 9 + SECURITY.md | 25 +- 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/common/security/AutoHDFS.java | 281 +++++++++++++++++++ .../hdfs/common/security/HdfsSecurityUtil.java | 30 +- .../src/jvm/storm/kafka/KafkaUtils.java | 11 +- .../src/jvm/storm/kafka/PartitionManager.java | 6 +- .../kafka/TopicOffsetOutOfRangeException.java | 25 ++ .../jvm/storm/kafka/UpdateOffsetException.java | 25 -- .../kafka/trident/TridentKafkaEmitter.java | 49 ++-- .../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 | 28 +- .../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 | 6 +- 28 files changed, 863 insertions(+), 413 deletions(-) ----------------------------------------------------------------------
