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/19 10:54:20 UTC
svn commit: r1411111 - in /camel/branches/camel-2.9.x: ./
camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties
Author: bvahdat
Date: Mon Nov 19 09:54:20 2012
New Revision: 1411111
URL: http://svn.apache.org/viewvc?rev=1411111&view=rev
Log:
Merged revisions 1411079 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
........
r1411079 | bvahdat | 2012-11-19 07:47:47 +0100 (Mo, 19 Nov 2012) | 1 line
Added the missing property for TransactedPropertyPlaceholderIssueTest.
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/branches/camel-2.10.x:r1411079
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties?rev=1411111&r1=1411110&r2=1411111&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties (original)
+++ camel/branches/camel-2.9.x/camel-core/src/test/resources/org/apache/camel/component/properties/myproperties.properties Mon Nov 19 09:54:20 2012
@@ -20,6 +20,7 @@ cool.result=result
cool.concat=mock:{{cool.result}}
cool.start=direct:cool
cool.showid=true
+cool.name=Camel
# circular reference test
cool.a={{cool.b}}
@@ -31,4 +32,4 @@ cool.mock=mock
myCoolCharset=iso-8859-1
slipDelimiter=##
-stop=true
\ No newline at end of file
+stop=true