[Aplaws-commit] r941 - in releases/1.0.3/ccm-core: . sql/ccm-core/upgrade

[<ssk...@vh...>]

Author: sskracic
Date: 2005-09-30 12:47:01 +0200 (Fri, 30 Sep 2005)
New Revision: 941

Modified:
   releases/1.0.3/ccm-core/application.xml
   releases/1.0.3/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql
Log:
  Integrated r940 onto 1.0.3 release branch (incorrect
path to the upgrade script).


Modified: releases/1.0.3/ccm-core/application.xml
===================================================================
--- releases/1.0.3/ccm-core/application.xml	2005-09-30 10:43:54 UTC (rev 940)
+++ releases/1.0.3/ccm-core/application.xml	2005-09-30 10:47:01 UTC (rev 941)
@@ -3,7 +3,7 @@
   name="ccm-core"
   prettyName="Core"
   version="6.2.0"
-  release="1"
+  release="2"
   webapp="ROOT"
   buildHooks="build-hooks.xml">
   <ccm:dependencies>

Modified: releases/1.0.3/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql
===================================================================
--- releases/1.0.3/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql	2005-09-30 10:43:54 UTC (rev 940)
+++ releases/1.0.3/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql	2005-09-30 10:47:01 UTC (rev 941)
@@ -17,5 +17,5 @@
 
 begin;
   \i ../postgres/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
-  \i ../postgres/upgrade/add_column_ignore_parent_index.sql
+  \i ../postgres/upgrade/6.1.1-6.1.2/add_column_ignore_parent_index.sql
 commit;