Return-Path: <common-commits-return-67623-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 1C668200CFA
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Fri, 28 Jul 2017 01:48:37 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 1AF4716B407; Thu, 27 Jul 2017 23:48:37 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 4D26416B412
	for <archive-asf-public@cust-asf.ponee.io>; Fri, 28 Jul 2017 01:48:36 +0200 (CEST)
Received: (qmail 88302 invoked by uid 500); 27 Jul 2017 23:48:33 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 87933 invoked by uid 99); 27 Jul 2017 23:48:33 -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; Thu, 27 Jul 2017 23:48:33 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 7626AF330C; Thu, 27 Jul 2017 23:48:32 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: aengineer@apache.org
To: common-commits@hadoop.apache.org
Date: Thu, 27 Jul 2017 23:48:45 -0000
Message-Id: <b3a447f3888c4ac690201981bbb9d487@git.apache.org>
In-Reply-To: <39b717879f5b448f8772d14f4311e814@git.apache.org>
References: <39b717879f5b448f8772d14f4311e814@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [14/34] hadoop git commit: YARN-6844.
 AMRMClientImpl.checkNodeLabelExpression() has wrong error message
 (Contributed by Manikandan R via Daniel Templeton)
archived-at: Thu, 27 Jul 2017 23:48:37 -0000

YARN-6844. AMRMClientImpl.checkNodeLabelExpression() has wrong error message
(Contributed by Manikandan R via Daniel Templeton)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4c40cd45
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4c40cd45
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4c40cd45

Branch: refs/heads/HDFS-7240
Commit: 4c40cd451cbdbce5d2b94ad0e7e3cc991c3439c5
Parents: 24853bf
Author: Daniel Templeton <templedf@apache.org>
Authored: Mon Jul 24 12:03:02 2017 -0700
Committer: Daniel Templeton <templedf@apache.org>
Committed: Mon Jul 24 12:03:02 2017 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c40cd45/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java
index 7da91de..7a21bc6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java
@@ -772,10 +772,10 @@ public class AMRMClientImpl<T extends ContainerRequest> extends AMRMClient<T> {
       return;
     }
 
-    // Don't support specifying >= 2 node labels in a node label expression now
+    // Don't support specifying > 1 node labels in a node label expression now
     if (exp.contains("&&") || exp.contains("||")) {
       throw new InvalidContainerRequestException(
-          "Cannot specify more than two node labels"
+          "Cannot specify more than one node label"
               + " in a single node label expression");
     }
   }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org