Author: dkulp
Date: Wed Nov 17 21:15:32 2010
New Revision: 1036230
URL: http://svn.apache.org/viewvc?rev=1036230&view=rev
Log:
Blocked revisions 1035078,1035172,1035487 via svnmerge
........
r1035078 | cschneider | 2010-11-14 16:44:25 -0500 (Sun, 14 Nov 2010) | 1 line
CXF-3123 initial commit of spnego auth with thanks to luca di stefano
........
r1035172 | ningjiang | 2010-11-15 03:18:38 -0500 (Mon, 15 Nov 2010) | 1 line
Try to fix the release plugin issue of cxf.version
........
r1035487 | cschneider | 2010-11-15 18:39:35 -0500 (Mon, 15 Nov 2010) | 1 line
Remove dependency cycle with config and move proxy logic out of HTTPConduit
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-blocked (original)
+++ svnmerge-blocked Wed Nov 17 21:15:32 2010
@@ -1 +1 @@
-/cxf/trunk:1022156,1023402-1023419,1030541,1031075,1033530,1033532,1033889,1033926
+/cxf/trunk:1022156,1023402-1023419,1030541,1031075,1033530,1033532,1033889,1033926,1035078,1035172,1035487
