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 at...@apache.org on 2011/11/30 19:27:19 UTC

svn commit: r1208644 - in /hadoop/common/branches/HDFS-1623: ./ pom.xml

Author: atm
Date: Wed Nov 30 18:27:04 2011
New Revision: 1208644

URL: http://svn.apache.org/viewvc?rev=1208644&view=rev
Log:
Merge trunk into HA branch.

Modified:
    hadoop/common/branches/HDFS-1623/   (props changed)
    hadoop/common/branches/HDFS-1623/pom.xml

Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 30 18:27:04 2011
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1208001
+/hadoop/common/trunk:1152502-1208622

Modified: hadoop/common/branches/HDFS-1623/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/pom.xml?rev=1208644&r1=1208643&r2=1208644&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/pom.xml Wed Nov 30 18:27:04 2011
@@ -123,7 +123,7 @@
         <configuration>
           <rules>
             <requireMavenVersion>
-              <version>[3.0.0,)</version>
+              <version>[3.0.2,)</version>
             </requireMavenVersion>
             <requireJavaVersion>
               <version>1.6</version>