Merging change r1036132 from trunk to federation

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/branches/HDFS-1052@1078862 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -2,6 +2,8 @@ Hadoop HDFS Change Log
 
 Trunk (unreleased changes)
 
+  INCOMPATIBLE CHANGES
+
   NEW FEATURES
 
     HDFS-1365. Federation: propose ClusterID and BlockPoolID format 
@@ -247,6 +249,7 @@ Trunk (unreleased changes)
 Release 0.22.0 - Unreleased
 
   NEW FEATURES
+
     HDFS-992. Re-factor block access token implementation to conform to the 
     generic Token interface in Common (Kan Zhang and Jitendra Pandey via jghoman)
 

build.xml

@@ -30,7 +30,7 @@
   <property name="name" value="hadoop-hdfs"/>
   <!-- Need to change aop.xml project.version prop. synchronously
    -->
-  <property name="version" value="0.22.0-SNAPSHOT"/>
+  <property name="version" value="0.23.0-SNAPSHOT"/>
   <property name="final.name" value="${name}-${version}"/>
   <property name="test.hdfs.final.name" value="${name}-test-${version}"/>
   <property name="ant.final.name" value="${name}-ant-${version}"/>

src/docs/src/documentation/content/xdocs/tabs.xml

@@ -32,6 +32,6 @@
 
   <tab label="Project" href="http://hadoop.apache.org/hdfs/" />
   <tab label="Wiki" href="http://wiki.apache.org/hadoop/HDFS" />
-  <tab label="HDFS 0.22 Documentation" dir="" />  
+  <tab label="HDFS 0.23 Documentation" dir="" />  
   
 </tabs>