You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/04/23 04:37:54 UTC

svn commit: r1329037 - /camel/branches/camel-2.8.x/

Author: hadrian
Date: Mon Apr 23 02:37:54 2012
New Revision: 1329037

URL: http://svn.apache.org/viewvc?rev=1329037&view=rev
Log:
Recorded merge of revisions 1242657,1242660-1242665,1242668-1242669,1242671,1242673-1242674,1242676,1242678,1242681-1242682,1242686,1242690-1243051,1243053-1243057,1243059-1243235,1243237-1244524,1244526-1244647,1244649-1244859,1244861-1244862,1244864,1244866-1244874,1244876,1244878-1245022,1245024-1245179,1245181-1291563,1291565-1291746,1291748-1291870,1291872-1291878,1291880-1292115,1292117-1292388,1292390-1292725,1292727-1292760,1292762-1292768,1292770-1293081,1293083-1293270,1293272-1293299,1293301-1293338,1293340-1293590,1293592-1293721,1293723-1293855,1293857-1293934,1293936-1294043,1294045-1294130,1294132-1294482,1294484-1294506,1294508-1294534,1294536-1294588,1294590-1294640,1294642-1294709,1294711-1294913,1294915-1294945,1294948-1294977,1294979-1295073,1295075-1295110,1295112-1295121,1295123-1295164,1295167-1295201,1295203-1295392,1295394,1295396-1295604,1295606-1295647,1295649,1295651-1296654,1296656-1296793,1296795-1298130,1298132-1298161,1298163-1298447,1298449-12
 98580,1298582-1298606,1298608-1298663,1298665-1298796,1298798-1298822,1298824-1299164,1299166-1299399,1299401-1299402,1299404-1299448,1299450-1300376,1300378-1300723,1300725-1300805,1300807-1300824 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x

................
  r1242657 | hadrian | 2012-02-09 22:52:52 -0500 (Thu, 09 Feb 2012) | 9 lines
  
  Merged revisions 1237676 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1237676 | davsclaus | 2012-01-30 09:26:32 -0500 (Mon, 30 Jan 2012) | 1 line
    
    Derby log in target dir
  ........
................
  r1244287 | hadrian | 2012-02-14 19:22:20 -0500 (Tue, 14 Feb 2012) | 1 line
  
  CAMEL-5006. Patch applied with thanks to Pat Fox
................
  r1300367 | cmueller | 2012-03-13 17:36:20 -0400 (Tue, 13 Mar 2012) | 1 line
  
  CAMEL-5081: org.apache.camel.component.mybatis.MyBatisBatchConsumerTest.testBatchConsumer() fails unpredictable
................
  r1300698 | cmueller | 2012-03-14 15:43:42 -0400 (Wed, 14 Mar 2012) | 1 line
  
  CAMEL-5083: org.apache.camel.component.ibatis.IBatisBatchConsumerTest.testBatchConsumer() fails unpredictable
................
  r1300824 | cmueller | 2012-03-15 03:25:16 -0400 (Thu, 15 Mar 2012) | 1 line
  
  CAMEL-5088: org.apache.camel.component.mail.MailProducerConcurrentTest.testConcurrentProducers() fails in unpredictable
................

Modified:
    camel/branches/camel-2.8.x/   (props changed)

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.