You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2016/10/11 16:05:34 UTC

[4/4] storm git commit: Merge branch 'STORM-2097'

Merge branch 'STORM-2097'


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

Branch: refs/heads/master
Commit: 0a5a069c6223bdb1e7b9318f208c1b29cb302560
Parents: 420e3f3 f807a21
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Tue Oct 11 09:05:19 2016 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Tue Oct 11 09:05:19 2016 -0700

----------------------------------------------------------------------
 CHANGELOG.md                                    |  1 +
 .../starter/spout/RandomSentenceSpout.java      | 39 ++++++++++-
 .../starter/trident/DebugMemoryMapState.java    | 73 ++++++++++++++++++++
 .../starter/trident/TridentKafkaWordCount.java  | 58 +++++++++++-----
 .../jvm/org/apache/storm/kafka/KafkaUtils.java  |  9 ++-
 .../trident/TransactionalTridentKafkaSpout.java |  8 +--
 .../kafka/trident/TridentKafkaEmitter.java      | 30 ++++++--
 .../storm/trident/operation/builtin/Debug.java  | 18 ++++-
 .../spout/IOpaquePartitionedTridentSpout.java   | 11 +--
 .../trident/spout/IPartitionedTridentSpout.java | 10 +--
 .../OpaquePartitionedTridentSpoutExecutor.java  | 62 +++++++++++++----
 .../spout/PartitionedTridentSpoutExecutor.java  | 24 +++++--
 .../trident/state/CombinerValueUpdater.java     |  9 +++
 .../topology/MasterBatchCoordinator.java        | 39 +++++++++--
 .../state/RotatingTransactionalState.java       | 59 +++++++++++++---
 .../topology/state/TransactionalState.java      | 44 ++++++++----
 16 files changed, 400 insertions(+), 94 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/0a5a069c/CHANGELOG.md
----------------------------------------------------------------------