Merge branch 'STORM-1571' of https://github.com/darionyaphet/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/455b2baf Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/455b2baf Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/455b2baf Branch: refs/heads/master Commit: 455b2baf1d2cab4a478f16a288cc6a60923612c2 Parents: bd396b3 d89f702 Author: Kyle Nusbaum <[email protected]> Authored: Wed Feb 24 13:52:41 2016 -0600 Committer: Kyle Nusbaum <[email protected]> Committed: Wed Feb 24 13:52:41 2016 -0600 ---------------------------------------------------------------------- .../src/jvm/org/apache/storm/kafka/PartitionManager.java | 5 ++--- .../jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
