You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/07/09 18:48:13 UTC
svn commit: r1359274 - in /camel/branches/camel-2.9.x: ./
camel-core/src/test/java/org/apache/camel/component/seda/
components/camel-http/
Author: bvahdat
Date: Mon Jul 9 16:48:12 2012
New Revision: 1359274
URL: http://svn.apache.org/viewvc?rev=1359274&view=rev
Log:
Merged revisions 1359269 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................
r1359269 | bvahdat | 2012-07-09 18:44:07 +0200 (Mo, 09 Jul 2012) | 9 lines
Merged revisions 1359265 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1359265 | bvahdat | 2012-07-09 18:39:51 +0200 (Mo, 09 Jul 2012) | 1 line
CAMEL-5432: Polished the unit-test.
........
................
Added:
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaRemoveRouteThenAddAgainTest.java
- copied unchanged from r1359269, camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaRemoveRouteThenAddAgainTest.java
Removed:
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaRemoveRouteThenAddItAgainTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-http/ (props changed)
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1359265
Merged /camel/branches/camel-2.10.x:r1359269
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Propchange: camel/branches/camel-2.9.x/components/camel-http/
------------------------------------------------------------------------------
Merged /camel/branches/camel-2.10.x/components/camel-http:r1359269
Merged /camel/trunk/components/camel-http:r1359265