Merge branch 'STORM-2092-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/937c0e8b Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/937c0e8b Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/937c0e8b Branch: refs/heads/1.x-branch Commit: 937c0e8bc4fa71eeab84359b50b6ee6dee79f8b1 Parents: bf5d5e6 9552ea3 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Mon Sep 19 08:46:27 2016 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Mon Sep 19 08:46:27 2016 +0900 ---------------------------------------------------------------------- .../storm/kafka/trident/TridentKafkaState.java | 43 +++++++++++++------- 1 file changed, 28 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
