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 zh...@apache.org on 2018/05/09 17:30:22 UTC
[03/50] [abbrv] hadoop git commit: YARN-4081. Add support for
multiple resource types in the Resource class. (Varun Vasudev via wangda)
YARN-4081. Add support for multiple resource types in the Resource class. (Varun Vasudev via wangda)
(cherry picked from commit 1bbab7c1570a2438b2fa6da70397dd1d5211a137)
Conflicts:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourcePBImpl.java
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/01e3cd45
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/01e3cd45
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/01e3cd45
Branch: refs/heads/yarn-8200
Commit: 01e3cd453754704373e9ed66cae5b00ec31a6ca4
Parents: 3cb9888
Author: Wangda Tan <wa...@apache.org>
Authored: Thu Sep 10 09:43:26 2015 -0700
Committer: Jonathan Hung <jh...@linkedin.com>
Committed: Wed May 9 10:05:47 2018 -0700
----------------------------------------------------------------------
.../src/main/resources/META-INF/LICENSE.txt | 1661 ++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 283 +++
.../yarn/api/protocolrecords/ResourceTypes.java | 27 +
.../hadoop/yarn/api/records/Resource.java | 205 ++-
.../yarn/api/records/ResourceInformation.java | 218 +++
.../exceptions/ResourceNotFoundException.java | 45 +
.../hadoop/yarn/util/UnitsConversionUtil.java | 197 +++
.../src/main/proto/yarn_protos.proto | 12 +
.../yarn/conf/TestResourceInformation.java | 70 +
.../yarn/util/TestUnitsConversionUtil.java | 120 ++
.../yarn/api/records/impl/pb/ProtoUtils.java | 13 +
.../api/records/impl/pb/ResourcePBImpl.java | 193 +-
.../hadoop/yarn/util/resource/Resources.java | 139 +-
.../hadoop/yarn/api/TestPBImplRecords.java | 4 +
14 files changed, 3105 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org