Author: dkulp Date: Mon Aug 8 17:32:52 2011 New Revision: 1155023 URL: http://svn.apache.org/viewvc?rev=1155023&view=rev Log: Blocked revisions 1146158,1146161,1146553,1148009,1148047,1148050,1148053,1148090-1148091,1151941,1152125,1154082,1154086,1154954 via svnmerge
........ r1146158 | hadrian | 2011-07-13 13:47:59 -0400 (Wed, 13 Jul 2011) | 1 line [maven-release-plugin] prepare release camel-2.8.0 ........ r1146161 | hadrian | 2011-07-13 13:50:05 -0400 (Wed, 13 Jul 2011) | 1 line [maven-release-plugin] prepare for next development iteration ........ r1146553 | davsclaus | 2011-07-14 00:39:52 -0400 (Thu, 14 Jul 2011) | 1 line Upgraded version in etc/pom.xml ........ r1148009 | hadrian | 2011-07-18 15:14:27 -0400 (Mon, 18 Jul 2011) | 1 line Revert version and redo 2.8.0 release ........ r1148047 | hadrian | 2011-07-18 16:52:24 -0400 (Mon, 18 Jul 2011) | 1 line [maven-release-plugin] prepare release camel-2.8.0 ........ r1148050 | hadrian | 2011-07-18 16:55:28 -0400 (Mon, 18 Jul 2011) | 1 line [maven-release-plugin] prepare for next development iteration ........ r1148053 | hadrian | 2011-07-18 17:20:13 -0400 (Mon, 18 Jul 2011) | 1 line Revert version and redo 2.8.0 release (need to remove tag and redo) ........ r1148090 | hadrian | 2011-07-18 19:13:34 -0400 (Mon, 18 Jul 2011) | 1 line [maven-release-plugin] prepare release camel-2.8.0 ........ r1148091 | hadrian | 2011-07-18 19:13:58 -0400 (Mon, 18 Jul 2011) | 1 line [maven-release-plugin] copy for tag camel-2.8.0 ........ r1151941 | hadrian | 2011-07-28 13:52:21 -0400 (Thu, 28 Jul 2011) | 1 line Creating camel-2.8.x fixes branch ........ r1152125 | jbonofre | 2011-07-29 02:55:25 -0400 (Fri, 29 Jul 2011) | 1 line Fix the version on the 2.8.x branch. ........ r1154082 | ningjiang | 2011-08-04 23:31:24 -0400 (Thu, 04 Aug 2011) | 3 lines Initialized merge tracking via "svnmerge" with revisions "1-1151940" from https://svn.apache.org/repos/asf/camel/tags/camel-2.8.0 ........ r1154086 | ningjiang | 2011-08-04 23:51:47 -0400 (Thu, 04 Aug 2011) | 3 lines Initialized merge tracking via "svnmerge" with revisions "1-1151940" from https://svn.apache.org/repos/asf/camel/trunk ........ r1154954 | ningjiang | 2011-08-08 09:19:27 -0400 (Mon, 08 Aug 2011) | 1 line Fixed the camel-2.8.x svn merge properties ........ Modified: camel/branches/camel-2.7.x/ (props changed) Propchange: camel/branches/camel-2.7.x/ ------------------------------------------------------------------------------ --- svnmerge-blocked (added) +++ svnmerge-blocked Mon Aug 8 17:32:52 2011 @@ -0,0 +1 @@ +/camel/branches/camel-2.8.x:1146158,1146161,1146553,1148009,1148047,1148050,1148053,1148090-1148091,1151941,1152125,1154082,1154086,1154954
