Author: cnauroth
Date: Wed Oct 30 21:53:23 2013
New Revision: 1537320
URL: http://svn.apache.org/r1537320
Log:
HDFS-5065. Merging change r1537319 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1537320&r1=1537319&r2=1537320&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Wed Oct 30 21:53:23 2013
@@ -110,8 +110,6 @@ Release 2.3.0 - UNRELEASED
HDFS-5035. getFileLinkStatus and rename do not correctly check permissions
of symlinks. (Andrew Wang via Colin Patrick McCabe)
- HDFS-5065. TestSymlinkHdfsDisable fails on Windows. (ivanmi)
-
HDFS-4816. transitionToActive blocks if the SBN is doing checkpoint image
transfer. (Andrew Wang)
@@ -214,6 +212,8 @@ Release 2.2.1 - UNRELEASED
HDFS-5432. TestDatanodeJsp fails on Windows due to assumption that loopback
address resolves to host name localhost. (cnauroth)
+ HDFS-5065. TestSymlinkHdfsDisable fails on Windows. (ivanmi)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
