Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-4480. Clean up some inappropriate imports. (Kai Zheng via umamahesh) 

(cherry picked from commit 0f82b5d878)
This commit is contained in:
Uma Mahesh 2015-12-19 23:10:13 -08:00
parent d984ba4fd7
commit fc9e130825
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java
View File

@ -31,7 +31,6 @@ import java.util.List;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.directory.api.ldap.aci.UserClass;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileSystem;

2
hadoop-yarn-project/CHANGES.txt
View File

@ -580,6 +580,8 @@ Release 2.8.0 - UNRELEASED
YARN-4164. Changed updateApplicationPriority API to return the updated YARN-4164. Changed updateApplicationPriority API to return the updated
application priority. (Rohith Sharma K S via jianhe) application priority. (Rohith Sharma K S via jianhe)
YARN-4480. Clean up some inappropriate imports. (Kai Zheng via umamahesh)
OPTIMIZATIONS OPTIMIZATIONS
YARN-3339. TestDockerContainerExecutor should pull a single image and not YARN-3339. TestDockerContainerExecutor should pull a single image and not

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/MockResourceManagerFacade.java
View File

@ -25,8 +25,8 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import org.apache.directory.api.util.Strings; import com.google.common.base.Strings;
import org.apache.directory.api.util.exception.NotImplementedException; import org.apache.commons.lang.NotImplementedException;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.TokenIdentifier; 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 // it is OK to hard code it to some dummy value
NodeId nodeId = NodeId nodeId =
NodeId.newInstance( NodeId.newInstance(
!Strings.isEmpty(rr.getResourceName()) ? rr !Strings.isNullOrEmpty(rr.getResourceName()) ? rr
.getResourceName() : "dummy", 1000); .getResourceName() : "dummy", 1000);
container.setNodeId(nodeId); container.setNodeId(nodeId);
container.setResource(rr.getCapability()); container.setResource(rr.getCapability());