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 gi...@apache.org on 2018/07/05 17:56:35 UTC
[2/2] hadoop git commit: Merge branch 'trunk' of
https://git-wip-us.apache.org/repos/asf/hadoop into trunk
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/hadoop into trunk
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c163d179
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c163d179
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c163d179
Branch: refs/heads/trunk
Commit: c163d1797ade0f47d35b4a44381b8ef1dfec5b60
Parents: 0d9804d 99febe7
Author: Giovanni Matteo Fumarola <gi...@apache.com>
Authored: Thu Jul 5 10:55:05 2018 -0700
Committer: Giovanni Matteo Fumarola <gi...@apache.com>
Committed: Thu Jul 5 10:55:05 2018 -0700
----------------------------------------------------------------------
.../dev-support/findbugs-exclude.xml | 17 +-
.../hadoop/yarn/api/records/Resource.java | 13 +
.../api/records/impl/LightWeightResource.java | 23 +-
.../scheduler/fair/ConfigurableResource.java | 69 ++++-
.../fair/FairSchedulerConfiguration.java | 174 ++++++++++--
.../allocation/AllocationFileQueueParser.java | 2 +-
.../resourcemanager/webapp/dao/AppInfo.java | 2 +-
.../webapp/dao/SchedulerInfo.java | 8 +-
.../fair/TestFairSchedulerConfiguration.java | 160 ++++++++---
.../webapp/TestRMWebServices.java | 31 ++-
.../webapp/TestRMWebServicesApps.java | 14 +-
...estRMWebServicesAppsCustomResourceTypes.java | 242 +++++++++++++++++
.../webapp/TestRMWebServicesCapacitySched.java | 30 +-
.../TestRMWebServicesConfigurationMutation.java | 5 +
.../webapp/TestRMWebServicesFairScheduler.java | 95 +++----
.../TestRMWebServicesSchedulerActivities.java | 2 +-
...ustomResourceTypesConfigurationProvider.java | 138 ++++++++++
.../FairSchedulerJsonVerifications.java | 139 ++++++++++
.../FairSchedulerXmlVerifications.java | 153 +++++++++++
...ervicesFairSchedulerCustomResourceTypes.java | 271 +++++++++++++++++++
.../webapp/helper/AppInfoJsonVerifications.java | 123 +++++++++
.../webapp/helper/AppInfoXmlVerifications.java | 132 +++++++++
.../webapp/helper/BufferedClientResponse.java | 57 ++++
.../helper/JsonCustomResourceTypeTestcase.java | 77 ++++++
.../ResourceRequestsJsonVerifications.java | 252 +++++++++++++++++
.../ResourceRequestsXmlVerifications.java | 215 +++++++++++++++
.../helper/XmlCustomResourceTypeTestCase.java | 112 ++++++++
.../src/site/markdown/FairScheduler.md | 6 +-
28 files changed, 2405 insertions(+), 157 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org