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/11/18 19:59:24 UTC
svn commit: r1410960 - in /camel/branches/camel-2.10.x: ./
camel-core/src/test/java/org/apache/camel/issues/
camel-core/src/test/java/org/apache/camel/processor/intercept/
Author: bvahdat
Date: Sun Nov 18 18:59:23 2012
New Revision: 1410960
URL: http://svn.apache.org/viewvc?rev=1410960&view=rev
Log:
Merged revisions 1410959 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1410959 | bvahdat | 2012-11-18 19:57:22 +0100 (So, 18 Nov 2012) | 1 line
CAMEL-5796: Move TransactedPropertyPlaceholderIssueTest to the correct package.
........
Added:
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/issues/TransactedPropertyPlaceholderIssueTest.java
- copied unchanged from r1410959, camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TransactedPropertyPlaceholderIssueTest.java
Removed:
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/intercept/TransactedPropertyPlaceholderIssueTest.java
Modified:
camel/branches/camel-2.10.x/ (props changed)
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1410959
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.