Merge branch 'trunk' into HDFS-12943
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8fc4cce1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8fc4cce1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8fc4cce1 Branch: refs/heads/HDFS-12943 Commit: 8fc4cce1e615ffe263c9ca020889becf16f45347 Parents: 2753d6c ea621fa Author: Chao Sun <[email protected]> Authored: Wed Dec 19 22:19:31 2018 -0800 Committer: Chao Sun <[email protected]> Committed: Wed Dec 19 22:19:31 2018 -0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/fs/shell/Ls.java | 40 ++++-- .../java/org/apache/hadoop/fs/shell/TestLs.java | 67 +++++++++- .../v2/app/job/impl/TaskAttemptImpl.java | 15 +++ .../v2/app/job/impl/TestTaskAttempt.java | 84 +++++++++++- hadoop-maven-plugins/pom.xml | 2 +- .../hadoop/ozone/freon/RandomKeyGenerator.java | 17 +-- .../hadoop/yarn/conf/YarnConfiguration.java | 6 +- .../client/api/ContainerShellWebSocket.java | 7 + .../yarn/client/api/impl/YarnClientImpl.java | 9 +- .../src/main/resources/yarn-default.xml | 9 ++ .../impl/container-executor.c | 132 +++++++++++++++++-- .../main/native/container-executor/impl/main.c | 3 + .../test/test-container-executor.c | 4 +- .../yarn/server/webproxy/WebAppProxy.java | 14 +- .../yarn/server/webproxy/WebAppProxyServer.java | 10 +- .../server/webproxy/TestWebAppProxyServer.java | 31 ++++- 16 files changed, 392 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
