Author: suresh
Date: Fri Apr 1 20:05:47 2011
New Revision: 1087874
URL: http://svn.apache.org/viewvc?rev=1087874&view=rev
Log:
Removed an unnecessary line introduced into CHANGES.txt by change r1087844
Modified:
hadoop/common/trunk/CHANGES.txt
Modified: hadoop/common/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1087874&r1=1087873&r2=1087874&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Fri Apr 1 20:05:47 2011
@@ -127,7 +127,6 @@ Trunk (unreleased changes)
HADOOP-7215. RPC clients must use network interface corresponding to
the host in the client's kerberos principal key. (suresh)
->>>>>>> .r1087843
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
