Author: dkulp Date: Mon Oct 3 18:12:47 2011 New Revision: 1178487 URL: http://svn.apache.org/viewvc?rev=1178487&view=rev Log: Merged revisions 1177968 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk
........ r1177968 | davsclaus | 2011-10-01 08:06:39 -0400 (Sat, 01 Oct 2011) | 1 line Upgrade to Netty 3.2.5 ........ Modified: camel/branches/camel-2.8.x/ (props changed) camel/branches/camel-2.8.x/parent/pom.xml Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.8.x/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1178487&r1=1178486&r2=1178487&view=diff ============================================================================== --- camel/branches/camel-2.8.x/parent/pom.xml (original) +++ camel/branches/camel-2.8.x/parent/pom.xml Mon Oct 3 18:12:47 2011 @@ -117,7 +117,7 @@ <mockito-version>1.8.5</mockito-version> <mvel-version>2.0.18</mvel-version> <mybatis-version>3.0.4</mybatis-version> - <netty-bundle-version>3.2.4.Final_1</netty-bundle-version> + <netty-bundle-version>3.2.5.Final_1</netty-bundle-version> <ode-version>1.3.3</ode-version> <ognl-version>2.7.3_3</ognl-version> <osgi-version>4.2.0</osgi-version>