You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/12/12 22:55:04 UTC
[1/2] git commit: updated refs/heads/master to f032c72
Repository: cloudstack
Updated Branches:
refs/heads/master 1a463a147 -> f032c7221
4.6.2 -> 4.7.0 upgrade does not use any scripts above 4.6.1
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/22a56214
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/22a56214
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/22a56214
Branch: refs/heads/master
Commit: 22a5621476ff21ab81239c26d0ea648489658741
Parents: bdaa60f
Author: Daan Hoogland <da...@onecht.net>
Authored: Sat Dec 12 21:51:14 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sat Dec 12 21:51:14 2015 +0100
----------------------------------------------------------------------
engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/22a56214/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
index 4bed3ff..67a1be8 100644
--- a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -248,6 +248,8 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
_upgradeMap.put("4.6.1", new DbUpgrade[] {new Upgrade461to470()});
+ _upgradeMap.put("4.6.2", new DbUpgrade[] {new Upgrade461to470()});
+
//CP Upgrades
_upgradeMap.put("3.0.3", new DbUpgrade[] {new Upgrade303to304(), new Upgrade304to305(), new Upgrade305to306(), new Upgrade306to307(), new Upgrade307to410(),
new Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470()});
[2/2] git commit: updated refs/heads/master to f032c72
Posted by re...@apache.org.
Merge pull request #1233 from DaanHoogland/master-4.6.1
4.6.2 -> 4.7.0 upgrade does not use any scripts above 4.6.1test build:
```
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 13:45 min
[INFO] Finished at: 2015-12-12T22:15:56+01:00
[INFO] Final Memory: 121M/914M
[INFO] ------------------------------------------------------------------------
~/cloudstack/cloudstack [master-4.6.1 21| 18]
```
* pr/1233:
4.6.2 -> 4.7.0 upgrade does not use any scripts above 4.6.1
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f032c722
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f032c722
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f032c722
Branch: refs/heads/master
Commit: f032c7221343c7f74efba77db822f4d436f82a69
Parents: 1a463a1 22a5621
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Dec 12 22:54:43 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Dec 12 22:54:43 2015 +0100
----------------------------------------------------------------------
engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------