hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmcc...@apache.org
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 GMT
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 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.6.1</version>
+        <version>1.7.5</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
-        <version>1.6.1</version>
+        <version>1.7.5</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jdt</groupId>
@@ -593,7 +593,7 @@
       <dependency>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro</artifactId>
-        <version>1.5.3</version>
+        <version>1.7.4</version>
       </dependency>
       <dependency>
         <groupId>net.sf.kosmosfs</groupId>

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



Mime
View raw message