Author: acmurthy
Date: Thu Sep 8 21:33:07 2011
New Revision: 1166914
URL: http://svn.apache.org/viewvc?rev=1166914&view=rev
Log:
Merge -r 1166912:1166913 from trunk to branch-0.23 to fix HADOOP-7598.
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1166914&r1=1166913&r2=1166914&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Thu Sep 8 21:33:07 2011
@@ -562,6 +562,9 @@ Release 0.23.0 - Unreleased
HADOOP-7606. Upgrade Jackson to version 1.7.1 to match the version required
by Jersey (Alejandro Abdelnur via atm)
+ HADOOP-7598. Fix smart-apply-patch.sh to handle patching from a sub
+ directory correctly. (Robert Evans via acmurthy)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
