Author: dkulp
Date: Fri Jun 15 19:36:45 2012
New Revision: 1350753
URL: http://svn.apache.org/viewvc?rev=1350753&view=rev
Log:
Blocking revisions 1350561,1350619 via git from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1350561 | coheigea | 2012-06-15 06:22:39 -0400 (Fri, 15 Jun 2012) | 2 lines
Added a WS-Security test that uses JaxWsProxyFactoryBean
........
........
r1350619 | dkulp | 2012-06-15 09:48:45 -0400 (Fri, 15 Jun 2012) | 2 lines
Fix a test that is randomly failing with ActiveMQ 5.6.
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-blocked (original)
+++ svnmerge-blocked Fri Jun 15 19:36:45 2012
@@ -1 +1 @@
-/cxf/trunk:1348223,1348240,1348245,1348933,1349550-1349551,1349926,1349967
+/cxf/trunk:1348223,1348240,1348245,1348933,1349550-1349551,1349926,1349967,1350561,1350619