Author: dkulp Date: Wed Sep 28 16:15:43 2011 New Revision: 1176942 URL: http://svn.apache.org/viewvc?rev=1176942&view=rev Log: Blocked revisions 1173827,1173830,1173840,1173957,1173986,1174004,1174227,1174249,1174263,1174554,1174765,1176238,1176262,1176266,1176268,1176348 via svnmerge
........ r1173827 | hadrian | 2011-09-21 16:16:36 -0400 (Wed, 21 Sep 2011) | 1 line CAMEL-4034. Add experimental camel-jclouds component as contributed. ........ r1173830 | hadrian | 2011-09-21 16:18:14 -0400 (Wed, 21 Sep 2011) | 1 line CAMEL-4034. Add experimental camel-jclouds component as contributed (missing directory) ........ r1173840 | hadrian | 2011-09-21 16:41:52 -0400 (Wed, 21 Sep 2011) | 1 line CAMEL-4034. A bit of cleanup and checkstyle fixes ........ r1173957 | ningjiang | 2011-09-22 02:10:30 -0400 (Thu, 22 Sep 2011) | 1 line Fixed a CS error of camel-core ........ r1173986 | cschneider | 2011-09-22 04:18:15 -0400 (Thu, 22 Sep 2011) | 1 line CAMEL-4425 Fix test failure in file component because of invalid URI ........ r1174004 | cschneider | 2011-09-22 05:09:59 -0400 (Thu, 22 Sep 2011) | 1 line Ignoring target ........ r1174227 | davsclaus | 2011-09-22 11:51:00 -0400 (Thu, 22 Sep 2011) | 1 line Fixed test ........ r1174249 | hadrian | 2011-09-22 12:39:40 -0400 (Thu, 22 Sep 2011) | 1 line CAMEL-4034. Added ALv2 license message and minor fixes ........ r1174263 | hadrian | 2011-09-22 12:58:38 -0400 (Thu, 22 Sep 2011) | 1 line Checkstyle ........ r1174554 | davsclaus | 2011-09-23 02:58:30 -0400 (Fri, 23 Sep 2011) | 1 line CAMEL-4366: Make it clear the load stat is 1 sec based ........ r1174765 | hadrian | 2011-09-23 09:53:40 -0400 (Fri, 23 Sep 2011) | 1 line CAMEL-4034. Add meta-inf files ........ r1176238 | davsclaus | 2011-09-27 03:05:57 -0400 (Tue, 27 Sep 2011) | 1 line CAMEL-4490: Preparing for restoring ResourceBasedEndpoint in camel-spring to be 100% backwards compatible. ........ r1176262 | davsclaus | 2011-09-27 04:05:28 -0400 (Tue, 27 Sep 2011) | 1 line CAMEL-4490: Restored ResourceBasedEndpoint in camel-spring to be backwards compatible. ........ r1176266 | ningjiang | 2011-09-27 04:14:37 -0400 (Tue, 27 Sep 2011) | 1 line Fixed CS errors of camel-core ........ r1176268 | ningjiang | 2011-09-27 04:22:36 -0400 (Tue, 27 Sep 2011) | 1 line Fix the CS error of camel-script ........ r1176348 | davsclaus | 2011-09-27 08:07:18 -0400 (Tue, 27 Sep 2011) | 1 line Added test based on user forum issue ........ Modified: camel/branches/camel-2.8.x/ (props changed) Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.