You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by co...@apache.org on 2012/05/11 15:54:17 UTC

svn commit: r1337164 - /cxf/branches/2.4.x-fixes/

Author: coheigea
Date: Fri May 11 13:54:17 2012
New Revision: 1337164

URL: http://svn.apache.org/viewvc?rev=1337164&view=rev
Log:
Blocking revisions 1337096 via  git from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1337096 | coheigea | 2012-05-11 11:00:50 +0100 (Fri, 11 May 2012) | 9 lines
  
  Systests/advanced refactor + using fork mode "once"
  
  
  Conflicts:
  
  	services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
  	services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java
  	services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java
  
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.