浏览代码

svn merge -c 1443309 from trunk for moving HDFS-4458 to 2.0.3-alpha in CHANGES.txt.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443310 13f79535-47bb-0310-9956-ffa450edef68
Tsz-wo Sze 12 年之前
父节点
当前提交
b3e306302a
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

+ 4 - 4
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -12,10 +12,6 @@ Release 2.0.4-beta - UNRELEASED
 
   BUG FIXES
 
-    HDFS-4458. In DFSUtil.getNameServiceUris(..), convert default fs URI using
-    NetUtils.createSocketAddr(..) for being consistent with other addresses.
-    (Binglin Chang via szetszwo)
-
 Release 2.0.3-alpha - 2013-02-06
 
   INCOMPATIBLE CHANGES
@@ -482,6 +478,10 @@ Release 2.0.3-alpha - 2013-02-06
     HDFS-4468.  Use the new StringUtils methods added by HADOOP-9252 and fix
     TestHDFSCLI and TestQuota. (szetszwo)
 
+    HDFS-4458. In DFSUtil.getNameServiceUris(..), convert default fs URI using
+    NetUtils.createSocketAddr(..) for being consistent with other addresses.
+    (Binglin Chang via szetszwo)
+
   BREAKDOWN OF HDFS-3077 SUBTASKS
 
     HDFS-3077. Quorum-based protocol for reading and writing edit logs.