Author: coheigea Date: Wed Jun 13 13:54:24 2012 New Revision: 1349852 URL: http://svn.apache.org/viewvc?rev=1349852&view=rev Log: Blocking revisions 1349843,1349845,1349847 via git from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1349843 | coheigea | 2012-06-13 14:44:09 +0100 (Wed, 13 Jun 2012) | 18 lines Merged revisions 1349831 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1349831 | coheigea | 2012-06-13 14:22:04 +0100 (Wed, 13 Jun 2012) | 10 lines Merged revisions 1349825 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1349825 | coheigea | 2012-06-13 14:10:54 +0100 (Wed, 13 Jun 2012) | 2 lines [CXF-4376] - STS encryptIssuedToken with the SymmetricKey KeyType does not work ........ ........ ........ ........ r1349845 | coheigea | 2012-06-13 14:44:21 +0100 (Wed, 13 Jun 2012) | 3 lines Recording revisions 1349831,1349832 via git from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ ........ r1349847 | coheigea | 2012-06-13 14:45:59 +0100 (Wed, 13 Jun 2012) | 3 lines Recording revisions 1349271,1349412,1349413,1349728,1349730 via git from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
