Merge branch 'trunk' into HDFS-1312
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/982bee0a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/982bee0a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/982bee0a Branch: refs/heads/HDFS-1312 Commit: 982bee0a1aa059feb831e5cd84c7bb43e97d497d Parents: 9d3bb15 709a814 Author: Anu Engineer <aengin...@apache.org> Authored: Mon Jun 13 14:17:08 2016 -0700 Committer: Anu Engineer <aengin...@apache.org> Committed: Mon Jun 13 14:17:08 2016 -0700 ---------------------------------------------------------------------- .../classification/tools/RootDocProcessor.java | 4 + .../authentication/client/AuthenticatedURL.java | 4 +- .../hadoop-auth/src/site/markdown/Examples.md | 4 +- .../java/org/apache/hadoop/fs/shell/Ls.java | 28 +- .../apache/hadoop/fs/shell/PrintableString.java | 72 + .../hadoop/io/retry/RetryInvocationHandler.java | 12 +- .../src/site/markdown/FileSystemShell.md | 3 +- .../org/apache/hadoop/fs/TestFsShellList.java | 78 + .../hadoop/fs/shell/TestPrintableString.java | 87 + .../apache/hadoop/fs/shell/package-info.java | 26 + .../apache/hadoop/io/retry/TestRetryProxy.java | 7 +- .../sink/TestRollingFileSystemSink.java | 8 +- .../src/test/resources/testConf.xml | 6 +- .../server/namenode/EncryptionZoneManager.java | 2 +- .../server/namenode/FSDirEncryptionZoneOp.java | 3 + .../src/main/webapps/hdfs/explorer.html | 9 + .../src/main/webapps/hdfs/explorer.js | 83 +- .../src/main/webapps/static/hadoop.css | 7 + .../hadoop/hdfs/TestEncryptionZonesWithKMS.java | 7 +- .../lib/input/UncompressedSplitLineReader.java | 8 +- .../jdiff/Apache_Hadoop_YARN_API_2.6.0.xml | 13076 ++++++++++++++++ .../jdiff/Apache_Hadoop_YARN_API_2.7.2.xml | 13692 +++++++++++++++++ .../jdiff/Apache_Hadoop_YARN_Client.2.6.0.xml | 2427 +++ .../jdiff/Apache_Hadoop_YARN_Client_2.7.2.xml | 2581 ++++ .../jdiff/Apache_Hadoop_YARN_Common_2.6.0.xml | 2870 ++++ .../jdiff/Apache_Hadoop_YARN_Common_2.7.2.xml | 3323 ++++ .../Apache_Hadoop_YARN_Server_Common_2.6.0.xml | 2059 +++ .../Apache_Hadoop_YARN_Server_Common_2.7.2.xml | 1801 +++ .../hadoop-yarn/dev-support/jdiff/Null.java | 20 + .../hadoop-yarn/hadoop-yarn-api/pom.xml | 2 + .../hadoop-yarn/hadoop-yarn-client/pom.xml | 2 + .../hadoop/yarn/client/api/AMRMClient.java | 43 +- .../yarn/client/api/async/AMRMClientAsync.java | 17 + .../yarn/client/api/impl/AMRMClientImpl.java | 294 +- .../client/api/impl/RemoteRequestsTable.java | 332 + .../client/api/impl/BaseAMRMProxyE2ETest.java | 197 + .../yarn/client/api/impl/TestAMRMClient.java | 26 +- .../impl/TestAMRMClientContainerRequest.java | 54 +- .../api/impl/TestAMRMClientOnRMRestart.java | 16 +- .../yarn/client/api/impl/TestAMRMProxy.java | 171 +- .../api/impl/TestDistributedScheduling.java | 644 +- .../yarn/client/api/impl/TestNMClient.java | 7 +- .../src/test/resources/core-site.xml | 25 - .../hadoop-yarn/hadoop-yarn-common/pom.xml | 2 + .../records/impl/pb/ResourceRequestPBImpl.java | 5 +- .../hadoop-yarn-server-common/pom.xml | 2 + .../TestContainerManagerRegression.java | 84 + .../resourcemanager/rmnode/RMNodeImpl.java | 37 + .../scheduler/fair/FSAppAttempt.java | 62 +- .../yarn/server/resourcemanager/MockNM.java | 57 +- .../resourcemanager/TestAMAuthorization.java | 22 + .../resourcemanager/TestClientRMTokens.java | 22 + .../resourcemanager/TestRMNodeTransitions.java | 44 + .../TestWorkPreservingRMRestart.java | 2 +- .../scheduler/fair/TestFairScheduler.java | 72 + hadoop-yarn-project/hadoop-yarn/pom.xml | 129 + 56 files changed, 43977 insertions(+), 700 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
