Author: veithen
Date: Sat Sep 24 10:24:50 2011
New Revision: 1175148
URL: http://svn.apache.org/viewvc?rev=1175148&view=rev
Log:
Merged r1172842 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 24 10:24:50 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842
Modified: axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml?rev=1175148&r1=1175147&r2=1175148&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml Sat Sep
24 10:24:50 2011
@@ -28,7 +28,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>rampart-documentaion</artifactId>
+ <artifactId>rampart-documentation</artifactId>
<packaging>pom</packaging>
<name>Rampart - Documentation</name>
<build>
