You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/12/22 18:13:37 UTC
svn commit: r1222354 - /camel/branches/camel-2.8.x/

Author: dkulp
Date: Thu Dec 22 17:13:37 2011
New Revision: 1222354

URL: http://svn.apache.org/viewvc?rev=1222354&view=rev
Log:
Recorded merge of revisions 1214395,1214428,1214739,1220370,1220605-1220606,1220715,1220758,1220853,1220932,1221892,1222079 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1214395 | jbonofre | 2011-12-14 13:21:29 -0500 (Wed, 14 Dec 2011) | 1 line
  
  [CAMEL-4777] Use Karaf features in place of direct usage of geronimo-serlvet, geronimo-jsp, geronimo-el
........
  r1214428 | jbonofre | 2011-12-14 14:53:21 -0500 (Wed, 14 Dec 2011) | 1 line
  
  [CAMEL-4777] Remove the geronimo-jsp reference as it's not explicitly used
........
  r1214739 | jbonofre | 2011-12-15 08:08:55 -0500 (Thu, 15 Dec 2011) | 1 line
  
  [CAMEL-4777] Fix codec version in the features and cleanup pax-web version (no more required)
........
  r1220370 | cmueller | 2011-12-18 06:59:10 -0500 (Sun, 18 Dec 2011) | 2 lines
  
  CAMEL-3591: Add Simple Email Service SES to camel-aws
  Thanks Bilgin for the patch
........
  r1220605 | hadrian | 2011-12-18 23:17:37 -0500 (Sun, 18 Dec 2011) | 1 line
  
  CAMEL-4794. Test demonstrating the problem
........
  r1220606 | hadrian | 2011-12-18 23:17:46 -0500 (Sun, 18 Dec 2011) | 1 line
  
  CAMEL-4794. Test demonstrating the problem
........
  r1220715 | davsclaus | 2011-12-19 07:28:03 -0500 (Mon, 19 Dec 2011) | 1 line
  
  CAMEL-4795: Fixed issue with throttler/delayer in async delayed mode, calling exchange done 2 times under certain conditions.
........
  r1220758 | cmueller | 2011-12-19 09:16:47 -0500 (Mon, 19 Dec 2011) | 1 line
  
  CAMEL-4793: Improve Camel aws-sdb component
........
  r1220853 | cmueller | 2011-12-19 12:17:50 -0500 (Mon, 19 Dec 2011) | 1 line
  
  CAMEL-3591: Add Simple Email Service SES to camel-aws
........
  r1220932 | hadrian | 2011-12-19 15:25:05 -0500 (Mon, 19 Dec 2011) | 1 line
  
  CAMEL-4794. Fix trigger restart. Shortened test time.
........
  r1221892 | cmueller | 2011-12-21 16:30:44 -0500 (Wed, 21 Dec 2011) | 1 line
  
  CAMEL-4810: camel-eventadmin do not work
........
  r1222079 | jbonofre | 2011-12-22 02:30:16 -0500 (Thu, 22 Dec 2011) | 1 line
  
  [CAMEL-4783] Replace ${pom.version} (deprecated) by ${project.version}
........

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

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