Author: bvahdat Date: Sun Nov 18 19:01:56 2012 New Revision: 1410961 URL: http://svn.apache.org/viewvc?rev=1410961&view=rev Log: Merged revisions 1410960 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1410960 | bvahdat | 2012-11-18 19:59:23 +0100 (So, 18 Nov 2012) | 9 lines 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.9.x/camel-core/src/test/java/org/apache/camel/issues/TransactedPropertyPlaceholderIssueTest.java - copied unchanged from r1410960, camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/issues/TransactedPropertyPlaceholderIssueTest.java Removed: camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/intercept/TransactedPropertyPlaceholderIssueTest.java Modified: camel/branches/camel-2.9.x/ (props changed) Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1410959 Merged /camel/branches/camel-2.10.x:r1410960 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available.
