Author: hadrian
Date: Mon Apr 2 18:41:52 2012
New Revision: 1308452
URL: http://svn.apache.org/viewvc?rev=1308452&view=rev
Log:
Recorded merge of revisions
1298337-1298421,1298423-1298446,1298448-1298550,1298552-1298779,1298781-1298784,1298786-1298794,1298796-1298820,1298822-1298992,1298994-1299161,1299163-1299190,1299192-1299194,1299196-1299382,1299384-1299398,1299400-1299445,1299447-1299450,1299452-1299605,1299607-1299972,1299974-1299988,1299990-1299991,1299993-1300060,1300062-1300084,1300086-1300217,1300219-1300378,1300380-1300478,1300480-1300689
via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1298337 | bvahdat | 2012-03-08 05:11:06 -0500 (Thu, 08 Mar 2012) | 1 line
CAMEL-5058: Polished the provided unit-test.
........
r1298341 | bvahdat | 2012-03-08 05:24:51 -0500 (Thu, 08 Mar 2012) | 1 line
CAMEL-5058: Usage of the "final" keyword by the provided unit-test to mark
TypicalConsumer as immutable.
........
r1298525 | boday | 2012-03-08 14:23:31 -0500 (Thu, 08 Mar 2012) | 1 line
CAMEL-5071 added SolrJ DirectXMLRequest support via the Exchange Body
........
r1298660 | boday | 2012-03-08 19:05:28 -0500 (Thu, 08 Mar 2012) | 1 line
CAMEL-5071 tweaked the solr message type detection logic to be more efficient
........
r1300359 | cmueller | 2012-03-13 17:27:41 -0400 (Tue, 13 Mar 2012) | 1 line
CAMEL-5081:
org.apache.camel.component.mybatis.MyBatisBatchConsumerTest.testBatchConsumer()
fails unpredictable
........
r1300689 | cmueller | 2012-03-14 15:01:48 -0400 (Wed, 14 Mar 2012) | 1 line
CAMEL-5083:
org.apache.camel.component.ibatis.IBatisBatchConsumerTest.testBatchConsumer()
fails unpredictable
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.