Repository: hadoop Updated Branches: refs/heads/branch-2 d984ba4fd -> fc9e13082
YARN-4480. Clean up some inappropriate imports. (Kai Zheng via umamahesh) (cherry picked from commit 0f82b5d878a76b1626c9e07b2fbb55ce2a79232a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fc9e1308 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fc9e1308 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fc9e1308 Branch: refs/heads/branch-2 Commit: fc9e1308255ab888809543418a57b5624770a7fa Parents: d984ba4 Author: Uma Mahesh <umamah...@apache.org> Authored: Sat Dec 19 23:10:13 2015 -0800 Committer: Uma Mahesh <umamah...@apache.org> Committed: Sat Dec 19 23:17:33 2015 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java | 1 - hadoop-yarn-project/CHANGES.txt | 2 ++ .../nodemanager/amrmproxy/MockResourceManagerFacade.java | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc9e1308/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java index e8338e5..77df4f0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java @@ -31,7 +31,6 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.directory.api.ldap.aci.UserClass; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.fs.FileSystem; http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc9e1308/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 3089104..5f6e141 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -580,6 +580,8 @@ Release 2.8.0 - UNRELEASED YARN-4164. Changed updateApplicationPriority API to return the updated application priority. (Rohith Sharma K S via jianhe) + YARN-4480. Clean up some inappropriate imports. (Kai Zheng via umamahesh) + OPTIMIZATIONS YARN-3339. TestDockerContainerExecutor should pull a single image and not http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc9e1308/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/MockResourceManagerFacade.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/amrmproxy/MockResourceManagerFacade.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/MockResourceManagerFacade.java index c83adee..9dd245d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/MockResourceManagerFacade.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/MockResourceManagerFacade.java @@ -25,8 +25,8 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.directory.api.util.Strings; -import org.apache.directory.api.util.exception.NotImplementedException; +import com.google.common.base.Strings; +import org.apache.commons.lang.NotImplementedException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.TokenIdentifier; @@ -224,7 +224,7 @@ public class MockResourceManagerFacade implements // it is OK to hard code it to some dummy value NodeId nodeId = NodeId.newInstance( - !Strings.isEmpty(rr.getResourceName()) ? rr + !Strings.isNullOrEmpty(rr.getResourceName()) ? rr .getResourceName() : "dummy", 1000); container.setNodeId(nodeId); container.setResource(rr.getCapability());
