Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5285A971A for ; Wed, 14 Dec 2011 19:16:35 +0000 (UTC) Received: (qmail 12094 invoked by uid 500); 14 Dec 2011 19:16:34 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 12059 invoked by uid 500); 14 Dec 2011 19:16:34 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 12043 invoked by uid 99); 14 Dec 2011 19:16:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Dec 2011 19:16:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Dec 2011 19:16:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3411A23888CD for ; Wed, 14 Dec 2011 19:16:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1214414 [1/3] - in /hadoop/common/branches/branch-1: ./ CHANGES.txt ivy/hadoop-core-pom-template.xml src/mapred/ Date: Wed, 14 Dec 2011 19:16:10 -0000 To: common-commits@hadoop.apache.org From: gkesavan@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111214191611.3411A23888CD@eris.apache.org> Author: gkesavan Date: Wed Dec 14 19:16:10 2011 New Revision: 1214414 URL: http://svn.apache.org/viewvc?rev=1214414&view=rev Log: HADOOP-7461. Fix to add jackson dependency to hadoop pom. Contributed by Giridharan Kesavan Modified: hadoop/common/branches/branch-1/ (props changed) hadoop/common/branches/branch-1/CHANGES.txt hadoop/common/branches/branch-1/ivy/hadoop-core-pom-template.xml hadoop/common/branches/branch-1/src/mapred/ (props changed) Propchange: hadoop/common/branches/branch-1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 14 19:16:10 2011 @@ -3,5 +3,6 @@ /hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115 /hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413 /hadoop/common/branches/branch-0.20-security-205:1174370,1174917,1176042,1176248,1176638,1176645,1202378 +/hadoop/common/branches/branch-1.0:1214410 /hadoop/core/branches/branch-0.19:713112 /hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569