Author: dkulp Date: Thu Jan 19 17:21:36 2012 New Revision: 1233481 URL: http://svn.apache.org/viewvc?rev=1233481&view=rev Log: Recorded merge of revisions 1233457,1233473 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1233457 | coheigea | 2012-01-19 11:38:45 -0500 (Thu, 19 Jan 2012) | 2 lines Fixed some policy alternative issues with WS-Security - Added + updated a lot of tests based around this ................ r1233473 | dkulp | 2012-01-19 12:12:17 -0500 (Thu, 19 Jan 2012) | 10 lines Recorded merge of revisions 1233454 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1233454 | coheigea | 2012-01-19 11:36:31 -0500 (Thu, 19 Jan 2012) | 2 lines Fixed some policy alternative issues with WS-Security - Added + updated a lot of tests based around this ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available.
