Author: coheigea Date: Tue Aug 7 16:34:29 2012 New Revision: 1370351 URL: http://svn.apache.org/viewvc?rev=1370351&view=rev Log: Blocking revisions 1370340,1370344,1370345 via git from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1370340 | coheigea | 2012-08-07 17:19:37 +0100 (Tue, 07 Aug 2012) | 15 lines Merged revisions 1370295 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1370295 | coheigea | 2012-08-07 15:59:13 +0100 (Tue, 07 Aug 2012) | 2 lines Only use default statement providers when no user-configured provider is available ........ Conflicts: services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java ........ ........ r1370344 | coheigea | 2012-08-07 17:21:23 +0100 (Tue, 07 Aug 2012) | 18 lines Merged revisions 1370306 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1370306 | coheigea | 2012-08-07 16:10:38 +0100 (Tue, 07 Aug 2012) | 10 lines Merged revisions 1370296 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1370296 | coheigea | 2012-08-07 15:59:32 +0100 (Tue, 07 Aug 2012) | 2 lines Adding the ability to run all STS basic systests in eclipse ........ ........ ........ ........ r1370345 | coheigea | 2012-08-07 17:21:35 +0100 (Tue, 07 Aug 2012) | 3 lines Recording revisions 1370305,1370306,1370307 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.
