From hcatalog-commits-return-713-apmail-incubator-hcatalog-commits-archive=incubator.apache.org@incubator.apache.org Mon Mar 5 18:32:27 2012 Return-Path: X-Original-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 02E9B95E5 for ; Mon, 5 Mar 2012 18:32:26 +0000 (UTC) Received: (qmail 12850 invoked by uid 500); 5 Mar 2012 18:32:26 -0000 Delivered-To: apmail-incubator-hcatalog-commits-archive@incubator.apache.org Received: (qmail 12803 invoked by uid 500); 5 Mar 2012 18:32:26 -0000 Mailing-List: contact hcatalog-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hcatalog-dev@incubator.apache.org Delivered-To: mailing list hcatalog-commits@incubator.apache.org Received: (qmail 12790 invoked by uid 99); 5 Mar 2012 18:32:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Mar 2012 18:32:26 +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; Mon, 05 Mar 2012 18:32:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A4A0D2388860; Mon, 5 Mar 2012 18:32:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1297153 - /incubator/hcatalog/trunk/src/test/e2e/hcatalog/tests/pig.conf Date: Mon, 05 Mar 2012 18:32:05 -0000 To: hcatalog-commits@incubator.apache.org From: gates@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120305183205.A4A0D2388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gates Date: Mon Mar 5 18:32:05 2012 New Revision: 1297153 URL: http://svn.apache.org/viewvc?rev=1297153&view=rev Log: Fixed merge garble left from previous checkin. Modified: incubator/hcatalog/trunk/src/test/e2e/hcatalog/tests/pig.conf Modified: incubator/hcatalog/trunk/src/test/e2e/hcatalog/tests/pig.conf URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/test/e2e/hcatalog/tests/pig.conf?rev=1297153&r1=1297152&r2=1297153&view=diff ============================================================================== --- incubator/hcatalog/trunk/src/test/e2e/hcatalog/tests/pig.conf (original) +++ incubator/hcatalog/trunk/src/test/e2e/hcatalog/tests/pig.conf Mon Mar 5 18:32:05 2012 @@ -303,7 +303,5 @@ store a into ':OUTPATH:';\, } ], }, # end g - ->>>>>>> .r1296703 ] }