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/06/13 12:47:54 UTC

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

Author: coheigea
Date: Wed Jun 13 10:47:54 2012
New Revision: 1349744

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

........
  r1349740 | coheigea | 2012-06-13 11:42:40 +0100 (Wed, 13 Jun 2012) | 16 lines
  
  Merged revisions 1349723 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1349723 | coheigea | 2012-06-13 11:16:37 +0100 (Wed, 13 Jun 2012) | 2 lines
  
    Changing the "Encrypted-UT" STS test-case to actually encrypt the issued token
  
  ........
  
  
  Conflicts:
  
  	services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
  	services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
  
........

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

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