Fix db creation issue caused from merge conflict.

2013-06-12 15:37:21 -07:00 · 2013-06-12 15:37:21 -07:00 · 80ed9254b6
parent 1b905463c8
commit 80ed9254b6
1 changed files with 2 additions and 0 deletions
--- 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 {
                }
            }
        }
+        */

 	}