Merge branch 'STORM-2940-merge'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0b320323 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0b320323 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0b320323 Branch: refs/heads/master Commit: 0b320323936018e34c7469af98c76bea50d7dc54 Parents: a715e9a b332503 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Sat Feb 10 09:12:18 2018 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Sat Feb 10 09:12:18 2018 +0900 ---------------------------------------------------------------------- .../grouping/LoadAwareShuffleGrouping.java | 35 ++++++++++++-------- .../grouping/LoadAwareShuffleGroupingTest.java | 33 +++++++++++++----- 2 files changed, 46 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
