You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/09/12 17:29:10 UTC
[1/3] git commit: updated refs/heads/master to abc7132
Repository: cloudstack
Updated Branches:
refs/heads/master d46e45991 -> abc713226
systemvmtemplate: set next CLOUDSTACK_VERSION to 4.5.0
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ad8ad404
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ad8ad404
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ad8ad404
Branch: refs/heads/master
Commit: ad8ad404fed41463b7b2730fa573537443ad22e5
Parents: d46e459
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Sep 12 17:19:46 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Sep 12 17:19:46 2014 +0200
----------------------------------------------------------------------
tools/appliance/definitions/systemvm64template/postinstall.sh | 2 +-
tools/appliance/definitions/systemvmtemplate/postinstall.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad8ad404/tools/appliance/definitions/systemvm64template/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh b/tools/appliance/definitions/systemvm64template/postinstall.sh
index da16cb8..32e59d9 100644
--- a/tools/appliance/definitions/systemvm64template/postinstall.sh
+++ b/tools/appliance/definitions/systemvm64template/postinstall.sh
@@ -19,7 +19,7 @@ set -x
ROOTPW=password
HOSTNAME=systemvm
-CLOUDSTACK_RELEASE=4.4.0
+CLOUDSTACK_RELEASE=4.5.0
add_backports () {
sed -i '/backports/d' /etc/apt/sources.list
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad8ad404/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index d085b25..a292203 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -19,7 +19,7 @@ set -x
ROOTPW=password
HOSTNAME=systemvm
-CLOUDSTACK_RELEASE=4.4.0
+CLOUDSTACK_RELEASE=4.5.0
add_backports () {
sed -i '/backports/d' /etc/apt/sources.list
[3/3] git commit: updated refs/heads/master to abc7132
Posted by bh...@apache.org.
DatabaseUpgradeChecker: add DB upgrade path from 4.3.1 to 4.5.0
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/abc71322
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/abc71322
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/abc71322
Branch: refs/heads/master
Commit: abc713226db57388843dc62f27232441e4e1c1d3
Parents: f059475
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Sep 12 17:28:14 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Sep 12 17:28:14 2014 +0200
----------------------------------------------------------------------
engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abc71322/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 8564a87..34d3bdf 100755
--- a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -66,6 +66,7 @@ import com.cloud.upgrade.dao.Upgrade410to420;
import com.cloud.upgrade.dao.Upgrade420to421;
import com.cloud.upgrade.dao.Upgrade421to430;
import com.cloud.upgrade.dao.Upgrade430to440;
+import com.cloud.upgrade.dao.Upgrade431to440;
import com.cloud.upgrade.dao.Upgrade440to441;
import com.cloud.upgrade.dao.Upgrade441to450;
import com.cloud.upgrade.dao.UpgradeSnapshot217to224;
@@ -212,6 +213,8 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
_upgradeMap.put("4.3.0", new DbUpgrade[] {new Upgrade430to440(), new Upgrade440to441(), new Upgrade441to450()});
+ _upgradeMap.put("4.3.1", new DbUpgrade[] {new Upgrade431to440(), new Upgrade440to441(), new Upgrade441to450()});
+
_upgradeMap.put("4.4.0", new DbUpgrade[] {new Upgrade440to441(), new Upgrade441to450()});
_upgradeMap.put("4.4.1", new DbUpgrade[] { new Upgrade441to450() });
[2/3] git commit: updated refs/heads/master to abc7132
Posted by bh...@apache.org.
schema: add Upgrade431to440 that extends 430to440
This adds an upgrade path from 4.3.1 to 4.4.0, the implementation of which
simply extends the Upgrade430to440 as there was no schema change between 4.3.0
and 4.3.1
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit 208399354fa82513e2fb70738cb6eee8454ea3a5)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f059475b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f059475b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f059475b
Branch: refs/heads/master
Commit: f059475b0d34fd86d3ee8e9ed48bb8fe751110ca
Parents: ad8ad40
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Sep 4 18:50:17 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Sep 12 17:26:33 2014 +0200
----------------------------------------------------------------------
.../com/cloud/upgrade/dao/Upgrade431to440.java | 39 ++++++++++++++++++++
1 file changed, 39 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f059475b/engine/schema/src/com/cloud/upgrade/dao/Upgrade431to440.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade431to440.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade431to440.java
new file mode 100644
index 0000000..98b52ac
--- /dev/null
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade431to440.java
@@ -0,0 +1,39 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.upgrade.dao;
+
+import org.apache.log4j.Logger;
+
+public class Upgrade431to440 extends Upgrade430to440 implements DbUpgrade {
+ final static Logger s_logger = Logger.getLogger(Upgrade431to440.class);
+
+ @Override
+ public String[] getUpgradableVersionRange() {
+ return new String[] {"4.3.1", "4.4.0"};
+ }
+
+ @Override
+ public String getUpgradedVersion() {
+ return "4.4.0";
+ }
+
+ @Override
+ public boolean supportsRollingUpgrade() {
+ return false;
+ }
+}