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:58 UTC
[13/18] storm git commit: Merge pull request #21 from apache/master
Merge pull request #21 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/232e4ace
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/232e4ace
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/232e4ace
Branch: refs/heads/master
Commit: 232e4ace33f4424031eef64fa64abd20c9735f9d
Parents: 8696317 44e9aaf
Author: caofangkun <ca...@gmail.com>
Authored: Wed Apr 29 08:53:32 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Wed Apr 29 08:53:32 2015 +0800
----------------------------------------------------------------------
CHANGELOG.md | 4 ++
README.markdown | 4 ++
.../documentation/Setting-up-a-Storm-cluster.md | 7 ++-
.../mapper/SimpleTridentHBaseMapMapper.java | 50 ++++++++++++++++++++
.../trident/mapper/TridentHBaseMapMapper.java | 40 ++++++++++++++++
.../hbase/trident/state/HBaseMapState.java | 45 ++++++++----------
.../src/jvm/backtype/storm/task/IBolt.java | 4 +-
.../storm/utils/DisruptorQueueTest.java | 38 ++++++++-------
8 files changed, 149 insertions(+), 43 deletions(-)
----------------------------------------------------------------------