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 E1088101C8 for ; Tue, 13 Aug 2013 21:20:19 +0000 (UTC) Received: (qmail 55550 invoked by uid 500); 13 Aug 2013 21:20:19 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 55494 invoked by uid 500); 13 Aug 2013 21:20:18 -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 55487 invoked by uid 99); 13 Aug 2013 21:20:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Aug 2013 21:20:18 +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, 13 Aug 2013 21:20:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 41B09238889B for ; Tue, 13 Aug 2013 21:19:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1513658 - in /hadoop/common/branches/HDFS-4949: ./ hadoop-project/ hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/ hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/ hadoop-tools/hadoop-stream... Date: Tue, 13 Aug 2013 21:19:57 -0000 To: common-commits@hadoop.apache.org From: cmccabe@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130813211957.41B09238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cmccabe Date: Tue Aug 13 21:19:53 2013 New Revision: 1513658 URL: http://svn.apache.org/r1513658 Log: merge trunk into HDFS-4949 branch Modified: hadoop/common/branches/HDFS-4949/ (props changed) hadoop/common/branches/HDFS-4949/.gitattributes hadoop/common/branches/HDFS-4949/hadoop-project/pom.xml hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/package.html (props changed) hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/package.html (props changed) Propchange: hadoop/common/branches/HDFS-4949/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk:r1509426-1512447 Modified: hadoop/common/branches/HDFS-4949/.gitattributes URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/.gitattributes?rev=1513658&r1=1513657&r2=1513658&view=diff ============================================================================== --- hadoop/common/branches/HDFS-4949/.gitattributes (original) +++ hadoop/common/branches/HDFS-4949/.gitattributes Tue Aug 13 21:19:53 2013 @@ -14,5 +14,6 @@ *.sh text eol=lf *.bat text eol=crlf +*.cmd text eol=crlf *.csproj text merge=union eol=crlf *.sln text merge=union eol=crlf Modified: hadoop/common/branches/HDFS-4949/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-project/pom.xml?rev=1513658&r1=1513657&r2=1513658&view=diff ============================================================================== --- hadoop/common/branches/HDFS-4949/hadoop-project/pom.xml (original) +++ hadoop/common/branches/HDFS-4949/hadoop-project/pom.xml Tue Aug 13 21:19:53 2013 @@ -548,12 +548,12 @@ org.slf4j slf4j-api - 1.6.1 + 1.7.5 org.slf4j slf4j-log4j12 - 1.6.1 + 1.7.5 org.eclipse.jdt @@ -593,7 +593,7 @@ org.apache.avro avro - 1.5.3 + 1.7.4 net.sf.kosmosfs Modified: hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java?rev=1513658&r1=1513657&r2=1513658&view=diff ============================================================================== --- hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java (original) +++ hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java Tue Aug 13 21:19:53 2013 @@ -169,6 +169,7 @@ public class TestCopyCommitter { Assert.fail("Preserve status failure"); } finally { TestDistCpUtils.delete(fs, "/tmp1"); + conf.unset(DistCpConstants.CONF_LABEL_PRESERVE_STATUS); } } Propchange: hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/package.html ------------------------------------------------------------------------------ svn:eol-style = native Propchange: hadoop/common/branches/HDFS-4949/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/package.html ------------------------------------------------------------------------------ svn:eol-style = native