hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r1358690 - in /hadoop/common/branches/branch-1: ./ CHANGES.txt ivy/hadoop-core-pom-template.xml src/mapred/
Date Sun, 08 Jul 2012 03:45:41 GMT
Author: cos
Date: Sun Jul  8 03:45:40 2012
New Revision: 1358690

URL: http://svn.apache.org/viewvc?rev=1358690&view=rev
Log:
svn merge -c 1358689 from branch-1.1 backporting HADOOP-8417.

Modified:
    hadoop/common/branches/branch-1/   (props changed)
    hadoop/common/branches/branch-1/CHANGES.txt   (contents, props changed)
    hadoop/common/branches/branch-1/ivy/hadoop-core-pom-template.xml
    hadoop/common/branches/branch-1/src/mapred/   (props changed)

Propchange: hadoop/common/branches/branch-1/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-1.1:r1358689

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1358690&r1=1358689&r2=1358690&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Sun Jul  8 03:45:40 2012
@@ -332,6 +332,8 @@ Release 1.1.0 - unreleased
     HDFS-6527. Backport HADOOP-7389: Use of TestingGroups by tests causes
     subsequent tests to fail.  (Ivan Mitic via szetszwo)
 
+    HDFS-8417. HADOOP-6963 didn't update hadoop-core-pom-template.xml (Zhihong Ted Yu via
cos)
+
 Release 1.0.3 - 2012.05.07
 
   NEW FEATURES

Propchange: hadoop/common/branches/branch-1/CHANGES.txt
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-1.1/CHANGES.txt:r1358689

Modified: hadoop/common/branches/branch-1/ivy/hadoop-core-pom-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/ivy/hadoop-core-pom-template.xml?rev=1358690&r1=1358689&r2=1358690&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/ivy/hadoop-core-pom-template.xml (original)
+++ hadoop/common/branches/branch-1/ivy/hadoop-core-pom-template.xml Sun Jul  8 03:45:40 2012
@@ -34,6 +34,11 @@
       <version>0.52</version>
     </dependency>
     <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.1</version>
+    </dependency>
+    <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
       <version>3.0.1</version>

Propchange: hadoop/common/branches/branch-1/src/mapred/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-1.1/src/mapred:r1358689



Mime
View raw message