[jbossws-commits] JBossWS SVN: r4429 - in stack/native/branches/native-2.0: ant-import and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-08-17 14:05:13 -0400 (Fri, 17 Aug 2007)
New Revision: 4429

Modified:
   stack/native/branches/native-2.0/ant-import/build-release.xml
   stack/native/branches/native-2.0/mergeinfo.txt
Log:
update mergeinfo.txt

Modified: stack/native/branches/native-2.0/ant-import/build-release.xml
===================================================================
--- stack/native/branches/native-2.0/ant-import/build-release.xml	2007-08-17 18:02:52 UTC (rev 4428)
+++ stack/native/branches/native-2.0/ant-import/build-release.xml	2007-08-17 18:05:13 UTC (rev 4429)
@@ -23,7 +23,7 @@
     <echo message="*  - Release the jbossws-${version.id} version in JIRA"/>
     <echo message="*  - Update portal-content/project.xml"/>
     <echo message="*  - Update portal-content/counter.xml"/>
-    <echo message="*  - Update news in portal-content/freezone/projectDescription.html"/>
+    <echo message="*  - Update news in portal-content/freezone/index.html"/>
     <echo message="*  - Verify release notes and install instructions"/>
     <echo message="*  - Publish the interop endpoints"/>
     <echo message="*  - Commit the portal-content"/>

Modified: stack/native/branches/native-2.0/mergeinfo.txt
===================================================================
--- stack/native/branches/native-2.0/mergeinfo.txt	2007-08-17 18:02:52 UTC (rev 4428)
+++ stack/native/branches/native-2.0/mergeinfo.txt	2007-08-17 18:05:13 UTC (rev 4429)
@@ -40,3 +40,10 @@
 svn merge -r4371:4372 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
 svn merge -r4377:4378 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
 svn merge -r4382:4383 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+
+thomas.diesler at jboss.com 17-Aug-2007
+svn merge -r4289:4294 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+svn merge -r4310:4311 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+svn merge -r4322:4326 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+svn merge -r4329:4356 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+svn merge -r4390:4426 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0