Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 A7DC3FD0B for ; Fri, 12 Apr 2013 15:49:17 +0000 (UTC) Received: (qmail 53882 invoked by uid 500); 12 Apr 2013 15:49:17 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 53853 invoked by uid 500); 12 Apr 2013 15:49:17 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 53844 invoked by uid 99); 12 Apr 2013 15:49:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Apr 2013 15:49:17 +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; Fri, 12 Apr 2013 15:49:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D089B23888E7; Fri, 12 Apr 2013 15:48:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1467321 - /accumulo/trunk/pom.xml Date: Fri, 12 Apr 2013 15:48:53 -0000 To: commits@accumulo.apache.org From: ctubbsii@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130412154853.D089B23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ctubbsii Date: Fri Apr 12 15:48:53 2013 New Revision: 1467321 URL: http://svn.apache.org/r1467321 Log: ACCUMULO-924 merge to trunk Modified: accumulo/trunk/pom.xml (contents, props changed) Modified: accumulo/trunk/pom.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1467321&r1=1467320&r2=1467321&view=diff ============================================================================== --- accumulo/trunk/pom.xml (original) +++ accumulo/trunk/pom.xml Fri Apr 12 15:48:53 2013 @@ -842,7 +842,6 @@ skipTests - !false Propchange: accumulo/trunk/pom.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Apr 12 15:48:53 2013 @@ -0,0 +1,20 @@ +/accumulo/branches/1.3/pom.xml:1309369,1328076,1330246,1330264,1330944,1349971,1354669 +/accumulo/branches/1.3/src/pom.xml:1309369,1328076,1330246,1349971,1354669 +/accumulo/branches/1.4/pom.xml:1305403-1382577,1382613,1388120,1388629,1393868,1396065,1396572,1396616,1396758,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1398514,1398801,1399211,1399717,1400976,1402571,1402682,1407301,1423032,1423629,1427864,1450271,1451700,1455610,1455639,1455980,1461548,1465687,1466199,1466259,1466627 +/accumulo/branches/1.4/src/pom.xml:1305403-1356900,1358206,1363430,1364778,1365213,1382566,1382923,1388120,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1399211,1400976,1402571,1402682,1407157,1423032,1423624,1427919,1428054,1450271,1455610,1455639,1455980,1461548,1465687,1466259,1466627 +/accumulo/branches/1.4.2/pom.xml:1399210,1402681 +/accumulo/branches/1.4.2/src/pom.xml:1399210,1402681 +/accumulo/branches/1.5/pom.xml:1447768-1467320 +/accumulo/branches/ACCUMULO-259/pom.xml:1343822-1438343 +/accumulo/branches/ACCUMULO-259-polishing/pom.xml:1449464-1451386 +/accumulo/branches/ACCUMULO-672/pom.xml:1357826,1357829,1357842,1357858,1358236,1359163 +/accumulo/trunk/src/pom.xml:1329425,1332224,1332278,1332347,1333047,1333070,1341000,1342373,1350779,1351691,1356400,1359721 +/incubator/accumulo/branches/1.3/pom.xml:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632 +/incubator/accumulo/branches/1.3/src/pom.xml:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632 +/incubator/accumulo/branches/1.3.5rc/pom.xml:1209938 +/incubator/accumulo/branches/1.3.5rc/src/pom.xml:1209938 +/incubator/accumulo/branches/1.4/pom.xml:1201902-1305402 +/incubator/accumulo/branches/1.4/src/pom.xml:1201899-1305402 +/incubator/accumulo/branches/1.4.0rc/pom.xml:1304025,1305326 +/incubator/accumulo/branches/1.4.0rc/src/pom.xml:1304025,1305326 +/incubator/accumulo/trunk/src/pom.xml:1178656-1201898,1205476,1205570,1208726,1222413,1222719,1222725,1222733-1222734,1296160-1296495