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 aa...@apache.org on 2015/05/08 04:16:38 UTC
hadoop git commit: YARN-1832. Fix wrong MockLocalizerStatus#equals
implementation. Contributed by Hong Zhiguo.
Repository: hadoop
Updated Branches:
refs/heads/trunk f489a4ec9 -> b167fe760
YARN-1832. Fix wrong MockLocalizerStatus#equals implementation. Contributed by Hong Zhiguo.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b167fe76
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b167fe76
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b167fe76
Branch: refs/heads/trunk
Commit: b167fe7605deb29ec533047d79d036eb65328853
Parents: f489a4e
Author: Akira Ajisaka <aa...@apache.org>
Authored: Fri May 8 11:14:45 2015 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Fri May 8 11:14:45 2015 +0900
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../containermanager/localizer/MockLocalizerStatus.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b167fe76/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index eed28d8..fac3fa5 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -336,6 +336,9 @@ Release 2.8.0 - UNRELEASED
YARN-2918. RM should not fail on startup if queue's configured labels do
not exist in cluster-node-labels. (Wangda Tan via jianhe)
+ YARN-1832. Fix wrong MockLocalizerStatus#equals implementation.
+ (Hong Zhiguo via aajisaka)
+
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b167fe76/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/MockLocalizerStatus.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/MockLocalizerStatus.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/MockLocalizerStatus.java
index f4e5d23..95acfe34 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/MockLocalizerStatus.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/MockLocalizerStatus.java
@@ -67,7 +67,7 @@ public class MockLocalizerStatus implements LocalizerStatus {
return false;
}
MockLocalizerStatus other = (MockLocalizerStatus) o;
- return getLocalizerId().equals(other)
+ return getLocalizerId().equals(other.getLocalizerId())
&& getResources().containsAll(other.getResources())
&& other.getResources().containsAll(getResources());
}