You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@storm.apache.org by ka...@apache.org on 2016/06/24 08:57:08 UTC

[2/3] storm git commit: Merge branch 'STORM-1907-1.x' into 1.x-branch

Merge branch 'STORM-1907-1.x' into 1.x-branch


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

Branch: refs/heads/1.x-branch
Commit: d8aa8ed036d646fc80fa15145f741cf9c0e4c3df
Parents: 12164fd 8117f48
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jun 24 17:56:29 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jun 24 17:56:29 2016 +0900

----------------------------------------------------------------------
 .../storm/starter/trident/TridentWordCount.java | 13 ++++++------
 .../spout/PartitionedTridentSpoutExecutor.java  | 21 ++++++++++----------
 2 files changed, 18 insertions(+), 16 deletions(-)
----------------------------------------------------------------------