Merge branch 'retries' into hboRepo

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

Branch: refs/heads/master
Commit: 5c1029a921483bc86c0b01fec37bfdaba13a206d
Parents: ea0989d 79e3efe
Author: Rick Kilgore <[email protected]>
Authored: Tue Sep 9 14:56:00 2014 -0700
Committer: Rick Kilgore <[email protected]>
Committed: Tue Sep 9 14:56:00 2014 -0700

----------------------------------------------------------------------
 external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java | 4 ++--
 external/storm-kafka/src/jvm/storm/kafka/SpoutConfig.java      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


Reply via email to