You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2015/05/29 21:49:39 UTC

[2/9] storm git commit: Merge branch '0.10.x-branch' of https://github.com/apache/incubator-storm into STORM-821

Merge branch '0.10.x-branch' of https://github.com/apache/incubator-storm into STORM-821


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

Branch: refs/heads/0.10.x-branch
Commit: f628bb4977cd908f8b85eca553604011248ac26f
Parents: 7771a4d 90c5994
Author: Parth Brahmbhatt <br...@gmail.com>
Authored: Tue May 26 15:41:14 2015 -0700
Committer: Parth Brahmbhatt <br...@gmail.com>
Committed: Tue May 26 15:41:14 2015 -0700

----------------------------------------------------------------------
 CHANGELOG.md                                                | 1 +
 external/storm-redis/README.md                              | 4 ++--
 .../storm/redis/trident/state/RedisClusterStateUpdater.java | 9 +++++++--
 .../apache/storm/redis/trident/state/RedisStateUpdater.java | 9 +++++++--
 .../apache/storm/redis/trident/WordCountTridentRedis.java   | 2 +-
 .../storm/redis/trident/WordCountTridentRedisCluster.java   | 2 +-
 storm-dist/binary/src/main/assembly/binary.xml              | 2 +-
 7 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------