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

[ha...@apache.org]

Author: hadrian
Date: Fri Jan 20 22:06:36 2012
New Revision: 1234175

URL: http://svn.apache.org/viewvc?rev=1234175&view=rev
Log:
Blocked revisions 1229570,1230321,1230346,1230534,1230684,1230691,1230710,1230837,1230883 via svnmerge

........
  r1229570 | dkulp | 2012-01-10 09:56:22 -0500 (Tue, 10 Jan 2012) | 1 line
  
  Fix a checkstyle issue
........
  r1230321 | cmueller | 2012-01-11 18:19:34 -0500 (Wed, 11 Jan 2012) | 1 line
  
  CAMEL-4767: Upgrade commons-codec:commons-codec:1.4 -> commons-codec:commons-codec:1.6
........
  r1230346 | gnodet | 2012-01-11 20:10:12 -0500 (Wed, 11 Jan 2012) | 1 line
  
  [CAMEL-4888] Test support classes for running junit tests with camel and blueprint
........
  r1230534 | hadrian | 2012-01-12 08:42:55 -0500 (Thu, 12 Jan 2012) | 1 line
  
  Fix build failure due to dependency on unavailable snapshot
........
  r1230684 | hadrian | 2012-01-12 13:25:36 -0500 (Thu, 12 Jan 2012) | 1 line
  
  CAMEL-4796. Patch applied with thanks to Babak
........
  r1230691 | hadrian | 2012-01-12 13:37:59 -0500 (Thu, 12 Jan 2012) | 1 line
  
  Ignore failing (hanging) test pending upgrade to pojosr 0.1.7
........
  r1230710 | dkulp | 2012-01-12 14:18:19 -0500 (Thu, 12 Jan 2012) | 4 lines
  
  Better search in a test so if the Bus itself configures in a new
  interceptor, test won't fail.
  Also add test dep into pom instead of grabbing transitively to make sure
  the requested version is picked up
........
  r1230837 | hadrian | 2012-01-12 18:25:41 -0500 (Thu, 12 Jan 2012) | 1 line
  
  Fix failing test
........
  r1230883 | hadrian | 2012-01-12 22:34:50 -0500 (Thu, 12 Jan 2012) | 1 line
  
  Fix build failure
........

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

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