Merge branch 'STORM-1363'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/313e960b Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/313e960b Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/313e960b Branch: refs/heads/master Commit: 313e960bedde3b2c47520a74c391425d79271727 Parents: 4986373 913d0c1 Author: Jungtaek Lim <[email protected]> Authored: Wed Feb 22 16:37:24 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Wed Feb 22 16:37:24 2017 +0900 ---------------------------------------------------------------------- .../storm/kafka/trident/TridentKafkaState.java | 50 +++++++++++++------- 1 file changed, 32 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
