Merge branch 'STORM-2932' of https://github.com/Ethanlm/storm into STORM-2932-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ab7b4ca7 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ab7b4ca7 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ab7b4ca7 Branch: refs/heads/master Commit: ab7b4ca7731fcab279d67a7837e195f40ebb378a Parents: a323987 2bd8a1a Author: Jungtaek Lim <kabh...@gmail.com> Authored: Wed Feb 14 12:24:47 2018 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Wed Feb 14 12:24:47 2018 +0900 ---------------------------------------------------------------------- conf/defaults.yaml | 4 ++-- storm-client/src/jvm/org/apache/storm/Config.java | 4 ++-- .../jvm/org/apache/storm/grouping/LoadAwareShuffleGrouping.java | 4 ++-- .../org/apache/storm/grouping/LoadAwareShuffleGroupingTest.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/ab7b4ca7/conf/defaults.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/ab7b4ca7/storm-client/src/jvm/org/apache/storm/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/ab7b4ca7/storm-client/src/jvm/org/apache/storm/grouping/LoadAwareShuffleGrouping.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/ab7b4ca7/storm-client/test/jvm/org/apache/storm/grouping/LoadAwareShuffleGroupingTest.java ----------------------------------------------------------------------
