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/22 22:00:21 UTC

[07/25] storm git commit: Merge pull request #3 from apache/master

Merge pull request #3 from apache/master

Merge from apache/storm master to caofangkun/apache-storm master

Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0b9bc2e0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0b9bc2e0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0b9bc2e0

Branch: refs/heads/master
Commit: 0b9bc2e0df417bf3faa4ff5be9f1c0a565cab9ca
Parents: 97ae36e e71e2a3
Author: caofangkun <ca...@gmail.com>
Authored: Thu Jan 8 16:20:10 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Thu Jan 8 16:20:10 2015 +0800

----------------------------------------------------------------------
 CHANGELOG.md                                    |  14 +
 DEVELOPER.md                                    |   5 +-
 README.markdown                                 |  18 +-
 SECURITY.md                                     |  25 +-
 bin/storm                                       |  59 ++--
 conf/defaults.yaml                              |   1 +
 docs/about/integrates.md                        |   2 +-
 docs/about/multi-language.md                    |   6 +-
 docs/about/simple-api.md                        |   2 +-
 .../Acking-framework-implementation.md          |   8 +-
 docs/documentation/Clojure-DSL.md               |   6 +-
 docs/documentation/Common-patterns.md           |   2 +-
 docs/documentation/Configuration.md             |   4 +-
 .../Creating-a-new-Storm-project.md             |   6 +-
 .../DSLs-and-multilang-adapters.md              |   3 +-
 ...Defining-a-non-jvm-language-dsl-for-storm.md |   2 +-
 docs/documentation/Distributed-RPC.md           |   2 +-
 docs/documentation/FAQ.md                       |   4 +-
 docs/documentation/Kestrel-and-Storm.md         |   2 +-
 docs/documentation/Lifecycle-of-a-topology.md   |  70 ++---
 docs/documentation/Maven.md                     |  50 +---
 docs/documentation/Multilang-protocol.md        |  30 +-
 .../Serialization-(prior-to-0.6.0).md           |   2 +-
 .../documentation/Setting-up-a-Storm-cluster.md |   4 +-
 .../Setting-up-development-environment.md       |   2 +-
 docs/documentation/Structure-of-the-codebase.md |  88 +++---
 docs/documentation/Transactional-topologies.md  |  12 +-
 docs/documentation/Trident-API-Overview.md      |   4 +-
 docs/documentation/Trident-spouts.md            |   8 +-
 docs/documentation/Trident-state.md             |  12 +-
 docs/documentation/Tutorial.md                  |   4 +-
 docs/downloads.html                             |   2 +-
 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 --
 .../FieldNameBasedTupleToKafkaMapper.java       |   2 +-
 .../kafka/trident/TridentKafkaEmitter.java      |  43 ++-
 .../src/test/storm/kafka/KafkaUtilsTest.java    |   2 +-
 .../src/clj/backtype/storm/daemon/logviewer.clj |  36 ++-
 .../src/clj/backtype/storm/daemon/nimbus.clj    |   7 +-
 .../clj/backtype/storm/daemon/supervisor.clj    |  22 +-
 storm-core/src/clj/backtype/storm/ui/core.clj   |   1 +
 storm-core/src/jvm/backtype/storm/Config.java   |  34 +--
 .../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 +-
 61 files changed, 1107 insertions(+), 627 deletions(-)
----------------------------------------------------------------------