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 662BDDB60 for ; Tue, 9 Oct 2012 16:36:43 +0000 (UTC) Received: (qmail 79039 invoked by uid 500); 9 Oct 2012 16:36:43 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 78979 invoked by uid 500); 9 Oct 2012 16:36:43 -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 78961 invoked by uid 99); 9 Oct 2012 16:36:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Oct 2012 16:36:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Oct 2012 16:36:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CDAEB23888EA for ; Tue, 9 Oct 2012 16:35:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1396101 - in /hadoop/common/branches/branch-1-win: CHANGES.branch-1-win.txt bin/hadoop-config.cmd Date: Tue, 09 Oct 2012 16:35:58 -0000 To: common-commits@hadoop.apache.org From: suresh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121009163558.CDAEB23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: suresh Date: Tue Oct 9 16:35:58 2012 New Revision: 1396101 URL: http://svn.apache.org/viewvc?rev=1396101&view=rev Log: HADOOP-8903. support HADOOP_USER_CLASSPATH_FIRST in windows hadoop cmd. Contributed by Thejas Nair. Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt hadoop/common/branches/branch-1-win/bin/hadoop-config.cmd Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1396101&r1=1396100&r2=1396101&view=diff ============================================================================== --- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original) +++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Tue Oct 9 16:35:58 2012 @@ -152,3 +152,6 @@ BUG FIXES HADOOP-8880. Missing jersey jars as dependency in the pom causes hive tests to fail. (gkesavan via suresh) + + HADOOP-8903. support HADOOP_USER_CLASSPATH_FIRST in windows hadoop cmd. + (Thejas Nair via suresh) Modified: hadoop/common/branches/branch-1-win/bin/hadoop-config.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/bin/hadoop-config.cmd?rev=1396101&r1=1396100&r2=1396101&view=diff ============================================================================== --- hadoop/common/branches/branch-1-win/bin/hadoop-config.cmd (original) +++ hadoop/common/branches/branch-1-win/bin/hadoop-config.cmd Tue Oct 9 16:35:58 2012 @@ -154,7 +154,12 @@ for %%i in (%HADOOP_CORE_HOME%\lib\jsp-2 @rem if defined HADOOP_CLASSPATH ( - set CLASSPATH=%CLASSPATH%;%HADOOP_CLASSPATH% + if defined HADOOP_USER_CLASSPATH_FIRST ( + set CLASSPATH=%HADOOP_CLASSPATH%;%CLASSPATH%; + ) + if not defined HADOOP_USER_CLASSPATH_FIRST ( + set CLASSPATH=%CLASSPATH%;%HADOOP_CLASSPATH%; + ) ) if not defined HADOOP_LOG_DIR (