Merge branch 'patch-6' of https://github.com/vesense/storm into STORM-1052
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/90ef005c Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/90ef005c Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/90ef005c Branch: refs/heads/master Commit: 90ef005c11dc32caaa1549ad73a4b7c9195a917b Parents: 14c7def 58f0994 Author: Sriharsha Chintalapani <[email protected]> Authored: Fri Nov 6 18:10:29 2015 -0800 Committer: Sriharsha Chintalapani <[email protected]> Committed: Fri Nov 6 18:10:29 2015 -0800 ---------------------------------------------------------------------- .../storm/kafka/trident/TridentKafkaState.java | 25 +++++++++++++------- .../src/test/storm/kafka/TestUtils.java | 7 +++--- .../test/storm/kafka/TridentKafkaTopology.java | 8 +++---- 3 files changed, 25 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/90ef005c/external/storm-kafka/src/test/storm/kafka/TestUtils.java ----------------------------------------------------------------------
