Author: davsclaus
Date: Fri Sep 23 12:29:31 2011
New Revision: 1174700
URL: http://svn.apache.org/viewvc?rev=1174700&view=rev
Log:
Blocked revisions 1146782,1146943,1146964,1146993,1147117 via svnmerge
........
r1146782 | davsclaus | 2011-07-14 18:37:50 +0200 (Thu, 14 Jul 2011) | 1 line
CAMEL-4212: Add support for multi value headers for the http related
components.
........
r1146943 | ningjiang | 2011-07-15 04:59:40 +0200 (Fri, 15 Jul 2011) | 1 line
CAMEL-4229 Added the wrap methods for template, consumer and context in
org.apache.camel.test.junit4.CamelContextSupport
........
r1146964 | davsclaus | 2011-07-15 07:49:32 +0200 (Fri, 15 Jul 2011) | 1 line
Added unit test based on user forum issue
........
r1146993 | ningjiang | 2011-07-15 09:39:57 +0200 (Fri, 15 Jul 2011) | 1 line
CAMEL-4229 Fixed the same issue of camel-testng
........
r1147117 | ningjiang | 2011-07-15 14:26:10 +0200 (Fri, 15 Jul 2011) | 1 line
CAMEL-4235 fixed the unit test error of CamelBlueprint2Test.testErrorHandler()
........
Modified:
camel/branches/camel-2.7.x/ (props changed)
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svnmerge-blocked (original)
+++ svnmerge-blocked Fri Sep 23 12:29:31 2011
@@ -1 +1 @@
-/camel/branches/camel-2.8.x:1146158,1146161,1146553,1146976,1146986,1146990,1147021,1148009,1148047,1148050,1148053,1148090-1148091,1151941,1152125,1154082,1154086,1154954
+/camel/branches/camel-2.8.x:1146158,1146161,1146553,1146782,1146943,1146964,1146976,1146986,1146990,1146993,1147021,1147117,1148009,1148047,1148050,1148053,1148090-1148091,1151941,1152125,1154082,1154086,1154954