Merge branch 'STORM-2120-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/7ddd3729
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7ddd3729
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7ddd3729

Branch: refs/heads/1.x-branch
Commit: 7ddd3729da3e03b40752f942934d37df5b795ec8
Parents: 43653ac 98cd74e
Author: Jungtaek Lim <kabh...@gmail.com>
Authored: Fri Sep 23 10:49:31 2016 +0900
Committer: Jungtaek Lim <kabh...@gmail.com>
Committed: Fri Sep 23 10:49:31 2016 +0900

----------------------------------------------------------------------
 .../src/jvm/org/apache/storm/kafka/PartitionManager.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to