Author: sseth
Date: Thu Feb 7 20:29:15 2013
New Revision: 1443704
URL: http://svn.apache.org/r1443704
Log:
merge YARN-385 from trunk. Add missing fields - location and #containers to
ResourceRequestPBImpl's toString(). Contributed by Sandy Ryza.
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1443704&r1=1443703&r2=1443704&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Thu Feb 7
20:29:15 2013
@@ -15,6 +15,9 @@ Release 2.0.4-beta - UNRELEASED
YARN-383. AMRMClientImpl should handle null rmClient in stop()
(Hitesh Shah via sseth)
+ YARN-385. Add missing fields - location and #containers to
+ ResourceRequestPBImpl's toString(). (Sandy Ryza via sseth)
+
Release 2.0.3-alpha - 2013-02-06
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java?rev=1443704&r1=1443703&r2=1443704&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java
Thu Feb 7 20:29:15 2013
@@ -166,6 +166,7 @@ public class ResourceRequestPBImpl exten
@Override
public String toString() {
return "{Priority: " + getPriority() + ", Capability: " + getCapability()
- + "}";
+ + ", # Containers: " + getNumContainers()
+ + ", Location: " + getHostName() + "}";
}
}
\ No newline at end of file
