Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 88A081871E for ; Sun, 20 Dec 2015 07:25:20 +0000 (UTC) Received: (qmail 99609 invoked by uid 500); 20 Dec 2015 07:25:19 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 99546 invoked by uid 500); 20 Dec 2015 07:25:19 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 99537 invoked by uid 99); 20 Dec 2015 07:25:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Dec 2015 07:25:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B328CDFD7A; Sun, 20 Dec 2015 07:25:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: umamahesh@apache.org To: common-commits@hadoop.apache.org Message-Id: <07a70c5ba535431a9ee969165fde672c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-4480. Clean up some inappropriate imports. (Kai Zheng via umamahesh) Date: Sun, 20 Dec 2015 07:25:18 +0000 (UTC) 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 Authored: Sat Dec 19 23:10:13 2015 -0800 Committer: Uma Mahesh 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());