Merge branch 'retries' of http://github.com/HBOCodeLabs/incubator-storm into
STORM-495
STORM-495: KafkaSpout retries with exponential backoff
Conflicts:
README.markdown
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/273fa637
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/273fa637
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/273fa637
Branch: refs/heads/master
Commit: 273fa637a193f3aa4c50dd901ed50d5a48e25a9e
Parents: fca7c76 fd06698
Author: Robert (Bobby) Evans <[email protected]>
Authored: Wed Jan 14 09:58:01 2015 -0600
Committer: Robert (Bobby) Evans <[email protected]>
Committed: Wed Jan 14 09:58:01 2015 -0600
----------------------------------------------------------------------
README.markdown | 1 +
external/storm-kafka/README.md | 22 ++-
external/storm-kafka/pom.xml | 21 +-
.../ExponentialBackoffMsgRetryManager.java | 167 ++++++++++++++++
.../jvm/storm/kafka/FailedMsgRetryManager.java | 26 +++
.../src/jvm/storm/kafka/PartitionManager.java | 42 ++--
.../src/jvm/storm/kafka/SpoutConfig.java | 8 +
.../ExponentialBackoffMsgRetryManagerTest.java | 194 +++++++++++++++++++
8 files changed, 460 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/273fa637/README.markdown
----------------------------------------------------------------------
diff --cc README.markdown
index 26e773b,946bf28..7eee582
--- a/README.markdown
+++ b/README.markdown
@@@ -179,10 -179,7 +179,11 @@@ under the License
* Anya Tchernishov ([@anyatch](https://github.com/anyatch))
* Ahmet DAL ([@javrasya](https://github.com/javrasya))
* Kai Sasaki ([@Lewuathe](https://github.com/Lewuathe))
+* Matthew Siegel ([@msiegel07](https://github.com/msiegel07))
+* Jun Xia ([@tedxia](https://github.com/tedxia))
+* caofangkun ([@caofangkun](https://github.com/caofangkun))
+* Mansheng Yang ([@lightyang](https://github.com/lightyang))
+ * Rick Kilgore ([@rick-kilgore](http://github.com/rick-kilgore))
## Acknowledgements
http://git-wip-us.apache.org/repos/asf/storm/blob/273fa637/external/storm-kafka/README.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/273fa637/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
----------------------------------------------------------------------
