Author: hadrian Date: Mon Apr 23 01:26:43 2012 New Revision: 1329019 URL: http://svn.apache.org/viewvc?rev=1329019&view=rev Log: Recorded merge of revisions 1236861-1237149,1237151-1237231,1237233-1237670,1237672-1237809,1237811-1238062,1238064-1238238,1238240-1238241,1238243-1238388,1238390-1238480,1238482,1238484-1238507,1238509-1238941,1238943-1238989,1238991-1239006,1239008-1239045,1239047-1239082,1239084-1239109,1239111-1239112,1239114-1239470,1239472-1239509,1239512-1240065,1240067-1240145,1240147-1240156,1240158-1240186,1240188-1240680,1240682-1240770,1240772-1240792,1240794-1241005,1241007-1241257,1241261-1241331,1241333-1241488,1241490-1241495,1241497-1241500,1241502-1241503,1241505-1241778,1241780-1241789,1241791-1241849 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x
................ r1236861 | bvahdat | 2012-01-27 14:47:33 -0500 (Fri, 27 Jan 2012) | 1 line CAMEL-4942: Jaxb-FallbackTypeConverter should hark to the contract of TypeConverter and not throw any unchecked exception if the conversion fails ................ r1239702 | jbonofre | 2012-02-02 11:17:43 -0500 (Thu, 02 Feb 2012) | 1 line [CAMEL-4280] Cleanup OSGi version in core ................ r1241786 | ningjiang | 2012-02-08 01:17:12 -0500 (Wed, 08 Feb 2012) | 9 lines Merged revisions 1241737 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1241737 | ningjiang | 2012-02-08 10:15:20 +0800 (Wed, 08 Feb 2012) | 1 line CAMEL-4990 SimpleExpression should trim the string before parsing ........ ................ r1241849 | cschneider | 2012-02-08 05:30:20 -0500 (Wed, 08 Feb 2012) | 4 lines Merged revision(s) 1240967 from camel/trunk: CAMEL-4985 Adjusting the configuration to the new style like used in the servlet tomcat example ........ ................ Modified: camel/branches/camel-2.8.x/ (props changed) Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available.
