Merge remote-tracking branch 'apache-commit/trunk' into HDDS-48
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/79b29811 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/79b29811 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/79b29811 Branch: refs/heads/HDDS-48 Commit: 79b298111fb9d1bd10251fd30a95173fa9ccb398 Parents: 5977718 a58acd9 Author: Arpit Agarwal <a...@apache.org> Authored: Thu May 31 11:45:01 2018 -0700 Committer: Arpit Agarwal <a...@apache.org> Committed: Thu May 31 11:45:01 2018 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/util/StringUtils.java | 2 +- .../org/apache/hadoop/util/TestStringUtils.java | 2 +- .../StorageContainerDatanodeProtocol.proto | 28 ++- .../hadoop/hdfs/web/WebHdfsFileSystem.java | 11 +- .../apache/hadoop/hdfs/tools/TestDFSAdmin.java | 59 +++--- .../apache/hadoop/hdfs/web/TestWebHdfsUrl.java | 55 ++++++ .../v2/app/job/impl/TaskAttemptImpl.java | 2 +- .../mapreduce/v2/app/webapp/AppController.java | 2 +- .../mapreduce/v2/app/webapp/TaskPage.java | 10 +- .../mapreduce/v2/app/webapp/TasksBlock.java | 6 +- .../v2/app/webapp/TestAppController.java | 2 +- .../mapreduce/checkpoint/RandomNameCNS.java | 2 +- .../HumanReadableHistoryViewerPrinter.java | 2 +- .../lib/output/PathOutputCommitterFactory.java | 2 +- .../hadoop/mapreduce/security/TokenCache.java | 2 +- .../org/apache/hadoop/mapreduce/tools/CLI.java | 2 +- .../lib/partition/TestRehashPartitioner.java | 2 +- .../mapreduce/v2/hs/webapp/HsJobsBlock.java | 8 +- .../mapreduce/v2/hs/webapp/HsTaskPage.java | 10 +- .../org/apache/hadoop/mapred/ClientCache.java | 2 +- .../hadoop/mapred/ClientServiceDelegate.java | 2 +- .../org/apache/hadoop/mapred/NotRunningJob.java | 12 +- .../org/apache/hadoop/mapred/YARNRunner.java | 2 +- .../apache/hadoop/mapred/TestJobCounters.java | 2 +- .../mapreduce/lib/db/TestDBOutputFormat.java | 2 +- .../hadoop-mapreduce-client/pom.xml | 5 - .../server/dns/BaseServiceRecordProcessor.java | 20 ++ .../dns/ContainerServiceRecordProcessor.java | 3 +- .../registry/server/dns/TestRegistryDNS.java | 62 ++++-- .../SingleConstraintAppPlacementAllocator.java | 187 ++++++++++--------- ...estSchedulingRequestContainerAllocation.java | 84 +++++++++ .../markdown/yarn-service/ServiceDiscovery.md | 14 +- pom.xml | 41 ++-- 33 files changed, 437 insertions(+), 210 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org