Author: hadrian
Date: Wed Apr 11 19:43:51 2012
New Revision: 1324950
URL: http://svn.apache.org/viewvc?rev=1324950&view=rev
Log:
Recorded merge of revisions
1309945-1310090,1310092-1310149,1310153-1310154,1310156-1310216,1310218-1310219,1310221,1310223-1310226,1310228-1310231,1310233-1310243,1310245-1310248,1310250-1310379,1310381-1310426,1310428-1310490,1310492-1310689,1310691-1310694,1310696-1310708,1310711-1310723,1310725-1310753,1310755-1310958,1310960-1310978,1310980-1310988,1310990-1310998,1311000-1311237,1311239-1311276,1311278-1311453,1311455-1311494,1311496-1311581,1311583-1311585,1311587-1311593,1311595-1311699,1311701-1311729,1311731,1311733-1311753,1311755-1311782
via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1309945 | davsclaus | 2012-04-05 13:04:04 -0400 (Thu, 05 Apr 2012) | 1 line
CAMEL-5137: Fixed timer component suspend/resume issue.
........
r1310725 | davsclaus | 2012-04-07 06:36:52 -0400 (Sat, 07 Apr 2012) | 1 line
CAMEL-5149: The default injector should perform bean post processing to setup
@Produce and the likes on the bean
........
r1311290 | davsclaus | 2012-04-09 11:53:17 -0400 (Mon, 09 Apr 2012) | 1 line
CAMEL-5150: Some cleanup in camel-netty according to Netty docs.
........
r1311782 | ningjiang | 2012-04-10 11:14:03 -0400 (Tue, 10 Apr 2012) | 1 line
CAMEL-5158 removed the System.out.println()
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
