You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/06/20 09:19:56 UTC
[23/50] [abbrv] git commit: updated refs/heads/master to 97f8c52
Fix db creation issue caused from merge conflict.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/80ed9254
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/80ed9254
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/80ed9254
Branch: refs/heads/master
Commit: 80ed9254b625f663a0631c4a18902476e3736313
Parents: 1b90546
Author: Min Chen <mi...@citrix.com>
Authored: Wed Jun 12 15:37:21 2013 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Wed Jun 12 15:37:21 2013 -0700
----------------------------------------------------------------------
engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/80ed9254/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index 1919486..8739ac9 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -312,6 +312,7 @@ public class Upgrade410to420 implements DbUpgrade {
} catch (SQLException e) {
}
}
+ /*
pstmt = null;
try {
pstmt = conn.prepareStatement("update vm_template set image_data_store_id = 1 where type = 'SYSTEM' or type = 'BUILTIN'");
@@ -326,6 +327,7 @@ public class Upgrade410to420 implements DbUpgrade {
}
}
}
+ */
}