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/04/02 22:00:34 UTC
svn commit: r1308515 - /camel/branches/camel-2.9.x/

Author: hadrian
Date: Mon Apr  2 20:00:34 2012
New Revision: 1308515

URL: http://svn.apache.org/viewvc?rev=1308515&view=rev
Log:
Recorded merge of revisions 1299446-1299605,1299607-1299972,1299974-1299988,1299990-1299991,1299993-1300060,1300062-1300084,1300086-1300217,1300219-1300358,1300360-1300478,1300480-1300688,1300690-1300719,1300721,1300723-1300803,1300806-1300825,1300827-1300830,1300832-1300913,1300915-1300958,1300960-1300970,1300972-1300973,1300975-1301114,1301116-1301315,1301317-1301351,1301353-1301363,1301365-1301374,1301377-1301393,1301395-1301570,1301572-1301630,1301632-1301643,1301645-1301655,1301657-1301677,1301679-1301720,1301722-1301790,1301792-1301899,1301901-1301906,1301908-1301909,1301912-1301939,1301941,1301943-1301950,1301952-1302005,1302007-1302083,1302085-1302092,1302095-1302107,1302109-1302110,1302112-1302328,1302330-1302352,1302354-1302356,1302358-1302392,1302394-1302479,1302481-1302483,1302485-1303300,1303302-1303352,1303354-1303556,1303559-1303564 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1299446 | cmueller | 2012-03-11 16:58:13 -0400 (Sun, 11 Mar 2012) | 1 line
  
  instruct hazelcast to use slf4j by running our unit tests
........
  r1299451 | cmueller | 2012-03-11 17:17:40 -0400 (Sun, 11 Mar 2012) | 1 line
  
  instruct hazelcast to use slf4j by running our unit tests
........
  r1300379 | cmueller | 2012-03-13 18:06:04 -0400 (Tue, 13 Mar 2012) | 1 line
  
  org.apache.camel.component.jetty.JettySimulateInOnlyTest.testSimulateInOnlyUsingWireTap() needs a few more time on our CI server
........
  r1303386 | hadrian | 2012-03-21 09:25:20 -0400 (Wed, 21 Mar 2012) | 1 line
  
  CAMEL-5098. Fix value of FAILURE_ENDPOINT header
........
  r1303564 | cmueller | 2012-03-21 16:43:13 -0400 (Wed, 21 Mar 2012) | 1 line
  
  CAMEL-4734: Consolidate the database vendors in our unit tests - work in progress
........

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

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