Merge branch 'STORM-2296-merge'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9e92e685 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9e92e685 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9e92e685 Branch: refs/heads/master Commit: 9e92e685b7a5390631e3ceb4347adffe4cfbd381 Parents: 38ee403 bd6e0c5 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Sat Feb 4 08:20:35 2017 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Sat Feb 4 08:20:35 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(-) ----------------------------------------------------------------------
