Merge branch 'STORM-2296-1.0.x-merge' into 1.0.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/98b0c0aa Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/98b0c0aa Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/98b0c0aa Branch: refs/heads/1.0.x-branch Commit: 98b0c0aa307e35ad91c5a8266267666713f64b1b Parents: 331764f fcbee34 Author: Jungtaek Lim <[email protected]> Authored: Fri Mar 10 01:30:01 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Fri Mar 10 01:30:01 2017 +0900 ---------------------------------------------------------------------- .../apache/storm/kafka/PartitionManager.java | 125 ++++++++++++------- .../org/apache/storm/kafka/ZkCoordinator.java | 16 ++- .../apache/storm/kafka/ZkCoordinatorTest.java | 42 ++++++- 3 files changed, 131 insertions(+), 52 deletions(-) ----------------------------------------------------------------------
