Merge branch 'STORM-1363-1.x' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4fc55b33 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4fc55b33 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4fc55b33 Branch: refs/heads/1.x-branch Commit: 4fc55b33504d446ef192a25e5164f861e1495291 Parents: ee1309d 187d08b Author: Jungtaek Lim <[email protected]> Authored: Wed Feb 22 16:35:53 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Wed Feb 22 16:35:53 2017 +0900 ---------------------------------------------------------------------- .../storm/kafka/trident/TridentKafkaState.java | 50 +++++++++++++------- 1 file changed, 32 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
