Author: dkulp Date: Mon Sep 19 23:35:27 2011 New Revision: 1172897 URL: http://svn.apache.org/viewvc?rev=1172897&view=rev Log: Blocked revisions 1162088,1162304-1162305,1162527,1162639,1162757,1162778,1162796 via svnmerge
........ r1162088 | ningjiang | 2011-08-26 08:33:02 -0400 (Fri, 26 Aug 2011) | 1 line CAMEL-4380 Added OSGi system test of it ........ r1162304 | davsclaus | 2011-08-27 03:13:10 -0400 (Sat, 27 Aug 2011) | 1 line Added filter with simple language test ........ r1162305 | davsclaus | 2011-08-27 03:17:57 -0400 (Sat, 27 Aug 2011) | 1 line CAMEL-2472: Removed zoo scheme name for zookeeper, as we should favor using zookeeper as the scheme name. ........ r1162527 | davsclaus | 2011-08-28 10:09:33 -0400 (Sun, 28 Aug 2011) | 1 line CAMEL-4390: Upgraded to HawtDB 1.6. ........ r1162639 | davsclaus | 2011-08-28 23:41:00 -0400 (Sun, 28 Aug 2011) | 1 line Disabled test which causes CI server to hang. ........ r1162757 | cschneider | 2011-08-29 08:24:55 -0400 (Mon, 29 Aug 2011) | 1 line Remove warnings ........ r1162778 | cschneider | 2011-08-29 09:00:21 -0400 (Mon, 29 Aug 2011) | 1 line Introduce abstraction WrappedFile for GenericFile to avoid dependencies to the file component from the rest of core ........ r1162796 | cschneider | 2011-08-29 09:26:10 -0400 (Mon, 29 Aug 2011) | 1 line Avoid reference from model to converter ........ Modified: camel/branches/camel-2.8.x/ (props changed) Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.