Merge branch 'trunk' into HDFS-7240
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/16dd69ad Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/16dd69ad Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/16dd69ad Branch: refs/heads/HDFS-7240 Commit: 16dd69ad4bb8b57a6aa15260e31700a527cef4e5 Parents: 0880d5e 8d29bf5 Author: Anu Engineer <[email protected]> Authored: Fri Sep 22 14:48:33 2017 -0700 Committer: Anu Engineer <[email protected]> Committed: Fri Sep 22 14:48:33 2017 -0700 ---------------------------------------------------------------------- .../hadoop/hdfs/util/StripedBlockUtil.java | 2 +- .../OfflineImageViewerPB.java | 11 +-- .../hadoop-mapreduce-examples/pom.xml | 4 + .../hadoop/examples/BaileyBorweinPlouffe.java | 7 +- .../apache/hadoop/examples/DBCountPageView.java | 7 +- .../apache/hadoop/examples/QuasiMonteCarlo.java | 5 +- .../hadoop/examples/dancing/DancingLinks.java | 7 +- .../org/apache/hadoop/examples/pi/DistSum.java | 11 +-- .../hadoop/examples/terasort/TeraGen.java | 6 +- .../examples/terasort/TeraOutputFormat.java | 7 +- .../hadoop/examples/terasort/TeraScheduler.java | 7 +- .../hadoop/examples/terasort/TeraSort.java | 6 +- .../hadoop/examples/terasort/TestTeraSort.java | 6 +- hadoop-project/pom.xml | 2 +- .../apache/hadoop/mapred/gridmix/SleepJob.java | 5 +- .../hadoop/yarn/conf/YarnConfiguration.java | 21 +++++ .../src/main/resources/yarn-default.xml | 19 +++++ ...pplicationHistoryManagerOnTimelineStore.java | 16 +++- .../webapp/TestAHSWebServices.java | 28 ++++++- .../hadoop/yarn/server/webapp/AppBlock.java | 44 +++++----- .../hadoop/yarn/server/webapp/WebServices.java | 3 +- .../privileged/PrivilegedOperationExecutor.java | 2 +- .../runtime/DefaultLinuxContainerRuntime.java | 8 +- .../runtime/DockerLinuxContainerRuntime.java | 85 ++++++++++++++++++-- .../linux/runtime/docker/DockerRunCommand.java | 7 ++ .../impl/container-executor.c | 4 + .../TestLinuxContainerExecutorWithMocks.java | 67 ++++++++++++++- .../runtime/TestDockerContainerRuntime.java | 82 ++++++++++++++++++- .../scheduler/fair/FSLeafQueue.java | 10 --- .../scheduler/fair/TestFSLeafQueue.java | 6 +- .../scheduler/fair/TestFairScheduler.java | 6 +- 31 files changed, 397 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/16dd69ad/hadoop-project/pom.xml ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
