Merge branch 'trunk' into HADOOP-12756
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7d4431c9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7d4431c9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7d4431c9 Branch: refs/heads/HADOOP-12756 Commit: 7d4431c93bf4faaa8ca54e2f9a219bf7e1d506b7 Parents: a194046 f67237c Author: Kai Zheng <kai.zh...@intel.com> Authored: Mon Sep 19 08:34:08 2016 +0800 Committer: Kai Zheng <kai.zh...@intel.com> Committed: Mon Sep 19 08:34:08 2016 +0800 ---------------------------------------------------------------------- .../hadoop/mapred/TaskAttemptListenerImpl.java | 2 +- .../jobhistory/JobHistoryEventHandler.java | 2 +- .../java/org/apache/hadoop/mapred/Task.java | 2 +- .../apache/hadoop/mapred/ShuffleHandler.java | 2 +- .../apache/hadoop/yarn/client/cli/TopCLI.java | 114 ++++++++++++++++--- .../hadoop/yarn/client/cli/TestTopCLI.java | 106 +++++++++++++++++ .../hadoop/yarn/event/AsyncDispatcher.java | 2 +- .../security/YarnAuthorizationProvider.java | 2 +- .../hadoop/yarn/webapp/util/WebAppUtils.java | 35 +++--- .../FileSystemApplicationHistoryStore.java | 2 +- .../monitor/ContainersMonitorImpl.java | 2 +- .../TestDefaultContainerExecutor.java | 8 +- .../reservation/AbstractReservationSystem.java | 2 +- .../scheduler/capacity/LeafQueue.java | 2 +- .../scheduler/capacity/ParentQueue.java | 4 +- .../scheduler/fair/FairScheduler.java | 2 +- 16 files changed, 242 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
