Return-Path: X-Original-To: apmail-pig-commits-archive@www.apache.org Delivered-To: apmail-pig-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 B8EED11E8B for ; Fri, 6 Jun 2014 23:52:59 +0000 (UTC) Received: (qmail 48350 invoked by uid 500); 6 Jun 2014 23:52:59 -0000 Delivered-To: apmail-pig-commits-archive@pig.apache.org Received: (qmail 48311 invoked by uid 500); 6 Jun 2014 23:52:59 -0000 Mailing-List: contact commits-help@pig.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pig.apache.org Delivered-To: mailing list commits@pig.apache.org Received: (qmail 48304 invoked by uid 99); 6 Jun 2014 23:52:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jun 2014 23:52:59 +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; Fri, 06 Jun 2014 23:53:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2BB85238889B; Fri, 6 Jun 2014 23:52:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1601039 - in /pig/branches/branch-0.13: CHANGES.txt bin/pig Date: Fri, 06 Jun 2014 23:52:36 -0000 To: commits@pig.apache.org From: daijy@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140606235236.2BB85238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: daijy Date: Fri Jun 6 23:52:35 2014 New Revision: 1601039 URL: http://svn.apache.org/r1601039 Log: PIG-3989: PIG_OPTS does not work with some version of HADOOP Modified: pig/branches/branch-0.13/CHANGES.txt pig/branches/branch-0.13/bin/pig Modified: pig/branches/branch-0.13/CHANGES.txt URL: http://svn.apache.org/viewvc/pig/branches/branch-0.13/CHANGES.txt?rev=1601039&r1=1601038&r2=1601039&view=diff ============================================================================== --- pig/branches/branch-0.13/CHANGES.txt (original) +++ pig/branches/branch-0.13/CHANGES.txt Fri Jun 6 23:52:35 2014 @@ -147,6 +147,8 @@ PIG-3882: Multiquery off mode execution BUG FIXES +PIG-3989: PIG_OPTS does not work with some version of HADOOP (daijy) + PIG-3739: The Warning_4 e2e test is broken in trunk (aniket486) PIG-3976: Typo correction in JobStats breaks Oozie (rohini) Modified: pig/branches/branch-0.13/bin/pig URL: http://svn.apache.org/viewvc/pig/branches/branch-0.13/bin/pig?rev=1601039&r1=1601038&r2=1601039&view=diff ============================================================================== --- pig/branches/branch-0.13/bin/pig (original) +++ pig/branches/branch-0.13/bin/pig Fri Jun 6 23:52:35 2014 @@ -365,10 +365,12 @@ if [ -n "$HADOOP_BIN" ]; then export HADOOP_CLASSPATH=$CLASSPATH:$HADOOP_CLASSPATH export HADOOP_OPTS="$JAVA_HEAP_MAX $PIG_OPTS $HADOOP_OPTS" + export HADOOP_CLIENT_OPTS="$JAVA_HEAP_MAX $PIG_OPTS $HADOOP_CLIENT_OPTS" if [ "$debug" == "true" ]; then echo "dry run:" echo "HADOOP_CLASSPATH: $HADOOP_CLASSPATH" echo "HADOOP_OPTS: $HADOOP_OPTS" + echo "HADOOP_CLIENT_OPTS: $HADOOP_CLIENT_OPTS" echo "$HADOOP_BIN" jar "$PIG_JAR" "${remaining[@]}" echo else