You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2020/03/24 13:46:18 UTC
[cloudstack] branch master updated (36efbfc -> 173174c)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 36efbfc Merge remote-tracking branch 'origin/4.13'
add e9b652a Updated upgrade path (#3971)
new 173174c Merge branch '4.13'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java | 5 +++++
.../{Upgrade41120to41130.java => Upgrade41300to41310.java} | 13 ++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
copy engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade41120to41130.java => Upgrade41300to41310.java} (86%)
[cloudstack] 01/01: Merge branch '4.13'
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 173174c804754941fe2496ff97dcd62c63b68f6b
Merge: 36efbfc e9b652a
Author: Daan Hoogland <da...@onecht.net>
AuthorDate: Tue Mar 24 13:41:45 2020 +0000
Merge branch '4.13'
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 5 +++
.../com/cloud/upgrade/dao/Upgrade41300to41310.java | 52 ++++++++++++++++++++++
2 files changed, 57 insertions(+)
diff --cc engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
index ee2b0cd,301594d..671f0ed
--- a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@@ -66,7 -66,7 +66,8 @@@ import com.cloud.upgrade.dao.Upgrade411
import com.cloud.upgrade.dao.Upgrade41120to41130;
import com.cloud.upgrade.dao.Upgrade41120to41200;
import com.cloud.upgrade.dao.Upgrade41200to41300;
+ import com.cloud.upgrade.dao.Upgrade41300to41310;
+import com.cloud.upgrade.dao.Upgrade41300to41400;
import com.cloud.upgrade.dao.Upgrade420to421;
import com.cloud.upgrade.dao.Upgrade421to430;
import com.cloud.upgrade.dao.Upgrade430to440;
@@@ -188,8 -188,7 +189,12 @@@ public class DatabaseUpgradeChecker imp
.next("4.11.2.0", new Upgrade41120to41130())
.next("4.11.3.0", new Upgrade41120to41200())
.next("4.12.0.0", new Upgrade41200to41300())
++<<<<<<< HEAD
+ .next("4.13.0.0", new Upgrade41300to41400())
+ .next("4.13.1.0", new Upgrade41300to41400())
++=======
+ .next("4.13.0.0", new Upgrade41300to41310())
++>>>>>>> 4.13
.build();
}