Author: veithen
Date: Thu Jun 2 14:23:59 2011
New Revision: 1130571
URL: http://svn.apache.org/viewvc?rev=1130571&view=rev
Log:
Merged r1130570 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml (props
changed)
axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml (props
changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml (props
changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
(props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml (props
changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml
(props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml (props
changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml
(props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml (props
changed)
axis/axis2/java/rampart/branches/1_6/pom.xml (props changed)
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 2 14:23:59 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570
Propchange: axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: axis/axis2/java/rampart/branches/1_6/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
