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/05/22 21:54:53 UTC

[08/18] storm git commit: Merge pull request #17 from apache/master

Merge pull request #17 from apache/master

Merge from apache/storm to caofangkun/apache-storm

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

Branch: refs/heads/master
Commit: 503a04ba1f470ab3f1f6b32109d27a401a8a2510
Parents: 2bc9447 2aaa718
Author: caofangkun <ca...@gmail.com>
Authored: Wed Apr 1 14:13:00 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Wed Apr 1 14:13:00 2015 +0800

----------------------------------------------------------------------
 CHANGELOG.md                                    |   7 +
 README.markdown                                 |   1 +
 STORM-UI-REST-API.md                            |  30 +++
 .../org/apache/storm/hbase/bolt/HBaseBolt.java  |   2 +-
 .../storm/hbase/bolt/HBaseLookupBolt.java       |   4 +-
 .../hbase/trident/state/HBaseMapState.java      |   2 +
 .../storm/hbase/trident/state/HBaseState.java   |   2 +-
 .../org/apache/storm/hdfs/bolt/HdfsBolt.java    |   2 +-
 .../storm/hdfs/bolt/SequenceFileBolt.java       |   2 +-
 .../src/jvm/storm/kafka/KafkaUtils.java         |  16 +-
 external/storm-redis/README.md                  | 108 ++++++++-
 .../redis/topology/PersistentWordCount.java     |  35 ---
 storm-core/src/clj/backtype/storm/ui/core.clj   |  62 ++++-
 .../src/clj/backtype/storm/ui/helpers.clj       |  15 +-
 storm-core/src/jvm/backtype/storm/Config.java   |   6 +
 .../jvm/backtype/storm/utils/NimbusClient.java  |   7 +
 .../storm/security/auth/nimbus_auth_test.clj    | 231 ++++++++++---------
 17 files changed, 364 insertions(+), 168 deletions(-)
----------------------------------------------------------------------