You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by bh...@apache.org on 2018/07/09 20:33:46 UTC
[37/37] hadoop git commit: Merge remote-tracking branch
'apache/trunk' into HDDS-48
Merge remote-tracking branch 'apache/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/9bd5bef2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9bd5bef2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9bd5bef2
Branch: refs/heads/trunk
Commit: 9bd5bef297b036b19f7be0c42c5477808ef8c070
Parents: 3584baf 2403231
Author: Arpit Agarwal <ar...@apache.org>
Authored: Mon Jul 9 13:22:58 2018 -0700
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Mon Jul 9 13:22:58 2018 -0700
----------------------------------------------------------------------
.../hadoop-common/src/main/conf/hadoop-env.sh | 6 +-
.../src/main/conf/hadoop-metrics2.properties | 2 +-
.../crypto/key/kms/KMSClientProvider.java | 4 +-
.../src/main/conf/kms-log4j.properties | 4 +-
.../src/test/resources/log4j.properties | 4 +-
hadoop-hdds/framework/pom.xml | 5 +
.../hadoop/hdds/server/events/EventQueue.java | 108 ++++++++------
.../hadoop/hdds/server/events/EventWatcher.java | 43 +++++-
.../hdds/server/events/EventWatcherMetrics.java | 79 ++++++++++
.../server/events/SingleThreadExecutor.java | 35 +++--
.../hdds/server/events/TestEventQueue.java | 35 +----
.../hdds/server/events/TestEventWatcher.java | 107 ++++++++++++--
.../hadoop/yarn/client/AMRMClientUtils.java | 91 ------------
.../hadoop/yarn/server/AMRMClientRelayer.java | 9 +-
.../yarn/server/uam/UnmanagedAMPoolManager.java | 16 ++
.../server/uam/UnmanagedApplicationManager.java | 40 ++---
.../yarn/server/MockResourceManagerFacade.java | 13 +-
.../amrmproxy/FederationInterceptor.java | 146 ++++++++++++++++---
.../amrmproxy/BaseAMRMProxyTest.java | 2 +
.../amrmproxy/TestFederationInterceptor.java | 17 +++
20 files changed, 515 insertions(+), 251 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org