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:20:20 UTC
[44/50] [abbrv] hadoop git commit: Merge branch 'trunk' into
HDDS-48-merge
Merge branch 'trunk' into HDDS-48-merge
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f870f0dd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f870f0dd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f870f0dd
Branch: refs/heads/HDDS-48
Commit: f870f0ddbe33357edb01bfa08d9d27db3fe10604
Parents: 860c588 4a08ddf
Author: Bharat Viswanadham <bh...@apache.org>
Authored: Mon Jul 9 12:53:43 2018 -0700
Committer: Bharat Viswanadham <bh...@apache.org>
Committed: Mon Jul 9 12:53:43 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/EventWatcher.java | 43 +++++-
.../hdds/server/events/EventWatcherMetrics.java | 79 ++++++++++
.../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 +++
17 files changed, 424 insertions(+), 164 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org