You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by gk...@apache.org on 2012/11/12 23:00:16 UTC
svn commit: r1408469 - in /hadoop/common/branches/branch-1: ./ CHANGES.txt ivy/hadoop-client-pom-template.xml ivy/hadoop-minicluster-pom-template.xml src/mapred/

Author: gkesavan
Date: Mon Nov 12 22:00:15 2012
New Revision: 1408469

URL: http://svn.apache.org/viewvc?rev=1408469&view=rev
Log:
HADOOP-9017. svn merge -r 1408467:1408468 from branch-1.1

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-client-pom-template.xml
    hadoop/common/branches/branch-1/ivy/hadoop-minicluster-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:r1408468

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1408469&r1=1408468&r2=1408469&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon Nov 12 22:00:15 2012
@@ -348,6 +348,10 @@ Release 1.1.1 - Unreleased
     MAPREDUCE-4749. Fixed a bug in TaskTracker because of which kill-actions get
     delayed progressively. (Arpit Gupta via vinodkv)
 
+    HADOOP-9017. Fix hadoop-client-pom-template.xml and
+    hadoop-client-pom-template.xml for version token ( gkesavan )
+
+
 Release 1.1.0 - 2012.09.28
 
   INCOMPATIBLE CHANGES

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

Modified: hadoop/common/branches/branch-1/ivy/hadoop-client-pom-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/ivy/hadoop-client-pom-template.xml?rev=1408469&r1=1408468&r2=1408469&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/ivy/hadoop-client-pom-template.xml (original)
+++ hadoop/common/branches/branch-1/ivy/hadoop-client-pom-template.xml Mon Nov 12 22:00:15 2012
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
-      <version>${project.version}</version>
+      <version>@version</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>

Modified: hadoop/common/branches/branch-1/ivy/hadoop-minicluster-pom-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/ivy/hadoop-minicluster-pom-template.xml?rev=1408469&r1=1408468&r2=1408469&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/ivy/hadoop-minicluster-pom-template.xml (original)
+++ hadoop/common/branches/branch-1/ivy/hadoop-minicluster-pom-template.xml Mon Nov 12 22:00:15 2012
@@ -32,13 +32,13 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
-      <version>${project.version}</version>
+      <version>@version</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-test</artifactId>
-      <version>${project.version}</version>
+      <version>@version</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

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