You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/06/20 18:31:46 UTC
svn commit: r1137689 - /cxf/branches/2.4.x-fixes/
Author: dkulp
Date: Mon Jun 20 16:31:46 2011
New Revision: 1137689
URL: http://svn.apache.org/viewvc?rev=1137689&view=rev
Log:
Recorded merge of revisions 1137658,1137678 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1137658 | coheigea | 2011-06-20 11:23:27 -0400 (Mon, 20 Jun 2011) | 1 line
[CXF-3605] - Fix for expiry regression
........
r1137678 | coheigea | 2011-06-20 12:15:23 -0400 (Mon, 20 Jun 2011) | 1 line
[CXF-3606] - CXF STS Provider framework only works with Issue Operation
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun 20 16:31:46 2011
@@ -1 +1 @@
-/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1134526,1135106,1135457,1135484,1135899,1136380,1136417,1136837,1136860,1136933,1136942-1136953,1136960,1137509,1137664
+/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1134526,1135106,1135457,1135484,1135899,1136380,1136417,1136837,1136860,1136933,1136942-1136953,1136960,1137509,1137658-1137678