Author: todd Date: Wed Mar 28 20:45:13 2012 New Revision: 1306587 URL: http://svn.apache.org/viewvc?rev=1306587&view=rev Log: Merge trunk into HDFS-3042 branch
Modified: hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-annotations/pom.xml hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-auth-examples/pom.xml hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-auth/pom.xml hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed) hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/pom.xml hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/test/core/ (props changed) hadoop/common/branches/HDFS-3042/hadoop-common-project/pom.xml Modified: hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-annotations/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-annotations/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-annotations/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-annotations/pom.xml Wed Mar 28 20:45:13 2012 @@ -17,12 +17,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-annotations</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <description>Apache Hadoop Annotations</description> <name>Apache Hadoop Annotations</name> <packaging>jar</packaging> Modified: hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-auth-examples/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-auth-examples/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-auth-examples/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-auth-examples/pom.xml Wed Mar 28 20:45:13 2012 @@ -17,12 +17,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth-examples</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>war</packaging> <name>Apache Hadoop Auth Examples</name> Modified: hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-auth/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-auth/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-auth/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-auth/pom.xml Wed Mar 28 20:45:13 2012 @@ -17,12 +17,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Apache Hadoop Auth</name> Modified: hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/CHANGES.txt Wed Mar 28 20:45:13 2012 @@ -113,7 +113,7 @@ Trunk (unreleased changes) HADOOP-7761. Improve the performance of raw comparisons. (todd) -Release 0.23.3 - UNRELEASED +Release 2.0.0 - UNRELEASED INCOMPATIBLE CHANGES Propchange: hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/CHANGES.txt ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1306184-1306586 Modified: hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/pom.xml Wed Mar 28 20:45:13 2012 @@ -17,12 +17,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project-dist</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../hadoop-project-dist</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <description>Apache Hadoop Common</description> <name>Apache Hadoop Common</name> <packaging>jar</packaging> Propchange: hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/main/docs/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1306184-1306586 Propchange: hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/main/java/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1306184-1306586 Modified: hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml Wed Mar 28 20:45:13 2012 @@ -28,7 +28,7 @@ <property> <name>hadoop.common.configuration.version</name> - <value>0.24.0</value> + <value>3.0.0</value> <description>version of this configuration file</description> </property> Propchange: hadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/test/core/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1306184-1306586 Modified: hadoop/common/branches/HDFS-3042/hadoop-common-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-common-project/pom.xml?rev=1306587&r1=1306586&r2=1306587&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3042/hadoop-common-project/pom.xml (original) +++ hadoop/common/branches/HDFS-3042/hadoop-common-project/pom.xml Wed Mar 28 20:45:13 2012 @@ -17,12 +17,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common-project</artifactId> - <version>0.24.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <description>Apache Hadoop Common Project</description> <name>Apache Hadoop Common Project</name> <packaging>pom</packaging>