You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/01/20 21:33:07 UTC
svn commit: r1234116 - /camel/branches/camel-2.9.x/
Author: hadrian
Date: Fri Jan 20 20:33:06 2012
New Revision: 1234116
URL: http://svn.apache.org/viewvc?rev=1234116&view=rev
Log:
Recorded merge of revisions 1227310-1227433 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1227310 | cmueller | 2012-01-04 15:38:34 -0500 (Wed, 04 Jan 2012) | 1 line
CAMEL-4862: Support relative time format in Camel SMPP by setting the validity periode
........
r1227433 | hadrian | 2012-01-04 20:56:06 -0500 (Wed, 04 Jan 2012) | 1 line
CAMEL-3774. Patch applied with thanks to Babak.
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 20 20:33:06 2012
@@ -1 +1 @@
-/camel/trunk:1-1227196,1227209,1227212,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782,1232834,1233183,1233259,1233269,1233398,1233442,1234043
+/camel/trunk:1-1227196,1227209,1227212,1227310-1227433,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782,1232834,1233183,1233259,1233269,1233398,1233442,1234043