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/02/10 06:57:25 UTC

svn commit: r1242688 - /camel/branches/camel-2.9.x/

Author: hadrian
Date: Fri Feb 10 05:57:25 2012
New Revision: 1242688

URL: http://svn.apache.org/viewvc?rev=1242688&view=rev
Log:
Recorded merge of revisions 1238794-1238936,1238938-1238987,1238989-1239005,1239007-1239044,1239046-1239079,1239082-1239159,1239161-1239169,1239171-1239461,1239463-1239469,1239471-1239478,1239480-1239496,1239498-1239506,1239508-1239531,1239533-1239622,1239624-1240014,1240016-1240024,1240026-1240062,1240064-1240066,1240068-1240070,1240072-1240086,1240088-1240143,1240145-1240350,1240352-1240365,1240367-1240371,1240373,1240375,1240377-1240391,1240393-1240407,1240409-1240575,1240578-1240678,1240680-1240691,1240693-1240694,1240696-1240697,1240699-1240703,1240706-1240708,1240710-1240711,1240713-1240729,1240731-1240734,1240736,1240738-1240752,1240754-1240824,1240826-1240832,1240834-1240949,1240951-1240975,1240978-1240999,1241001-1241057,1241059-1241064,1241066-1241067 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1238794 | hadrian | 2012-01-31 15:34:07 -0500 (Tue, 31 Jan 2012) | 1 line
  
  Add serialVersionUID for Serializable resolver
........
  r1240769 | jbonofre | 2012-02-05 12:55:45 -0500 (Sun, 05 Feb 2012) | 1 line
  
  [CAMEL-4979] Upgrade to hsqldb 2.2.8
........
  r1240792 | jbonofre | 2012-02-05 15:03:19 -0500 (Sun, 05 Feb 2012) | 1 line
  
  [CAMEL-4981] Upgrade to jruby 1.6.6
........
  r1240967 | cschneider | 2012-02-06 05:38:50 -0500 (Mon, 06 Feb 2012) | 1 line
  
  CAMEL-4985 Adjusting the configuration to the new style like used in the servlet tomcat example
........
  r1241067 | bvahdat | 2012-02-06 11:36:58 -0500 (Mon, 06 Feb 2012) | 1 line
  
  Avoid NPE in the case getComponent(name) returns null.
........

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

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