Author: dkulp
Date: Thu Dec 22 16:56:52 2011
New Revision: 1222348
URL: http://svn.apache.org/viewvc?rev=1222348&view=rev
Log:
Recorded merge of revisions
1210085,1210104,1210230,1210241,1210674,1213054,1213320,1213431,1213462 via
svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1210085 | cmueller | 2011-12-04 04:20:42 -0500 (Sun, 04 Dec 2011) | 1 line
CAMEL-4734: Consolidate the database vendors in our unit tests - work in
progress
........
r1210104 | cmueller | 2011-12-04 08:09:09 -0500 (Sun, 04 Dec 2011) | 1 line
CAMEL-4738: Remove the version numbers from Spring configuration files
........
r1210230 | cmueller | 2011-12-04 16:32:12 -0500 (Sun, 04 Dec 2011) | 2 lines
CAMEL-4738: Remove the version numbers from Spring configuration files
Thanks Babak for this hint
........
r1210241 | cmueller | 2011-12-04 16:52:24 -0500 (Sun, 04 Dec 2011) | 2 lines
CAMEL-4738: Remove the version numbers from Spring configuration files
Thanks Babak for this hint
........
r1210674 | cmueller | 2011-12-05 17:23:58 -0500 (Mon, 05 Dec 2011) | 1 line
CAMEL-4734: Consolidate the database vendors in our unit tests - work in
progress
........
r1213054 | cmueller | 2011-12-11 15:28:07 -0500 (Sun, 11 Dec 2011) | 1 line
CAMEL-4734: Consolidate the database vendors in our unit tests - work in
progress
........
r1213320 | cmueller | 2011-12-12 12:16:13 -0500 (Mon, 12 Dec 2011) | 1 line
CAMEL-4675: Allign the version number for qpid we use in our component and in
our feature file
........
r1213431 | cmueller | 2011-12-12 15:42:14 -0500 (Mon, 12 Dec 2011) | 2 lines
CAMEL-4721: Upgrade com.amazonaws:aws-java-sdk 1.1.1 -> 1.2.12
Thank you Bilgin for the patch
........
r1213462 | cmueller | 2011-12-12 17:03:01 -0500 (Mon, 12 Dec 2011) | 1 line
CAMEL-4721: Upgrade com.amazonaws:aws-java-sdk 1.1.1 -> 1.2.12
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
