You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ol...@apache.org on 2008/12/02 00:10:44 UTC
svn commit: r722280 - in /continuum/trunk: ./
continuum-docs/src/site/apt/installation/upgrade.apt
continuum-docs/src/site/xdoc/
Author: olamy
Date: Mon Dec 1 15:10:44 2008
New Revision: 722280
URL: http://svn.apache.org/viewvc?rev=722280&view=rev
Log:
merge -r 722278:722279 from 1.2.x branch
Modified:
continuum/trunk/ (props changed)
continuum/trunk/continuum-docs/src/site/apt/installation/upgrade.apt
continuum/trunk/continuum-docs/src/site/xdoc/ (props changed)
Propchange: continuum/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 1 15:10:44 2008
@@ -1 +1 @@
-/continuum/branches/continuum-1.2.x:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339
+/continuum/branches/continuum-1.2.x:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279
Modified: continuum/trunk/continuum-docs/src/site/apt/installation/upgrade.apt
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/installation/upgrade.apt?rev=722280&r1=722279&r2=722280&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/apt/installation/upgrade.apt (original)
+++ continuum/trunk/continuum-docs/src/site/apt/installation/upgrade.apt Mon Dec 1 15:10:44 2008
@@ -40,7 +40,7 @@
* {{http://repo1.maven.org/maven2/org/apache/maven/continuum/data-management-cli/1.1/data-management-cli-1.1-app.jar}}
- * {{http://repo1.maven.org/maven2/org/apache/maven/continuum/data-management-cli/1.2/data-management-cli-1.2-app.jar}}
+ * {{http://repo1.maven.org/maven2/org/apache/continuum/data-management-cli/1.2/data-management-cli-1.2-app.jar}}
The first version of this tool is 1.1-beta-2
Propchange: continuum/trunk/continuum-docs/src/site/xdoc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 1 15:10:44 2008
@@ -1,2 +1,2 @@
-/continuum/branches/continuum-1.2.x/continuum-docs/src/site/xdoc:698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339
+/continuum/branches/continuum-1.2.x/continuum-docs/src/site/xdoc:698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279
/continuum/trunk/continuum-docs/src/site/xdoc:690494-690520