Author: vinodkv
Date: Tue Sep 6 14:58:30 2011
New Revision: 1165692
URL: http://svn.apache.org/viewvc?rev=1165692&view=rev
Log:
HADOOP-7606. svn merge -c r1164779 --ignore-ancestry ../../trunk/
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=1165692&r1=1165691&r2=1165692&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
Tue Sep 6 14:58:30 2011
@@ -553,6 +553,9 @@ Release 0.23.0 - Unreleased
HADOOP-7593. Fix AssertionError in TestHttpServer.testMaxThreads().
(Uma Maheswara Rao G via szetszwo)
+ HADOOP-7606. Upgrade Jackson to version 1.7.1 to match the version required
+ by Jersey (Alejandro Abdelnur via atm)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
