You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/04/18 16:26:25 UTC

git commit: updated refs/heads/4.0 to c898b72

Updated Branches:
  refs/heads/4.0 8608ba30d -> c898b72b3


CLOUDSTACK-2090 Fix upgradepath from 4.0.1 to 4.0.2


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c898b72b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c898b72b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c898b72b

Branch: refs/heads/4.0
Commit: c898b72b33f761c21ad2898de9a042057fef30c3
Parents: 8608ba3
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Thu Apr 18 16:12:52 2013 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Thu Apr 18 16:16:12 2013 +0200

----------------------------------------------------------------------
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |    4 +---
 .../src/com/cloud/upgrade/dao/Upgrade401to402.java |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c898b72b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
index 0cca5c2..b5be77b 100755
--- a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -173,9 +173,7 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
 
         _upgradeMap.put("4.0.0", new DbUpgrade[] { new Upgrade40to401(), new Upgrade401to402()});
 
-        _upgradeMap.put("4.0.1", new DbUpgrade[] { new Upgrade40to401(), new Upgrade401to402() });
-
-        _upgradeMap.put("4.0.2", new DbUpgrade[] { new Upgrade40to401(), new Upgrade401to402() });
+        _upgradeMap.put("4.0.1", new DbUpgrade[] { new Upgrade401to402() });
 
     }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c898b72b/server/src/com/cloud/upgrade/dao/Upgrade401to402.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/upgrade/dao/Upgrade401to402.java b/server/src/com/cloud/upgrade/dao/Upgrade401to402.java
index c4dedcd..f71620a 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade401to402.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade401to402.java
@@ -22,7 +22,7 @@ import java.sql.Connection;
 import org.apache.log4j.Logger;
 
 public class Upgrade401to402 implements DbUpgrade {
-    final static Logger s_logger = Logger.getLogger(Upgrade40to401.class);
+    final static Logger s_logger = Logger.getLogger(Upgrade401to402.class);
 
     @Override
     public String[] getUpgradableVersionRange() {