Merge branch '4.13'

engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java

@@ -66,6 +66,7 @@ import com.cloud.upgrade.dao.Upgrade41110to41120;
 import com.cloud.upgrade.dao.Upgrade41120to41130;
 import com.cloud.upgrade.dao.Upgrade41120to41200;
 import com.cloud.upgrade.dao.Upgrade41200to41300;
+import com.cloud.upgrade.dao.Upgrade41300to41310;
 import com.cloud.upgrade.dao.Upgrade41300to41400;
 import com.cloud.upgrade.dao.Upgrade420to421;
 import com.cloud.upgrade.dao.Upgrade421to430;
@@ -188,8 +189,12 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
                 .next("4.11.2.0", new Upgrade41120to41130())
                 .next("4.11.3.0", new Upgrade41120to41200())
                 .next("4.12.0.0", new Upgrade41200to41300())
+<<<<<<< HEAD
                 .next("4.13.0.0", new Upgrade41300to41400())
                 .next("4.13.1.0", new Upgrade41300to41400())
+=======
+                .next("4.13.0.0", new Upgrade41300to41310())
+>>>>>>> 4.13
                 .build();
     }
 

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41300to41310.java

@@ -0,0 +1,52 @@
+// 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 java.io.InputStream;
+import java.sql.Connection;
+
+public class Upgrade41300to41310 implements DbUpgrade {
+    @Override
+    public String[] getUpgradableVersionRange() {
+        return new String[] {"4.13.0.0", "4.13.1.0"};
+    }
+
+    @Override
+    public String getUpgradedVersion() {
+        return "4.13.1.0";
+    }
+
+    @Override
+    public boolean supportsRollingUpgrade() {
+        return false;
+    }
+
+    @Override
+    public InputStream[] getPrepareScripts() {
+        return new InputStream[0];
+    }
+
+    @Override
+    public void performDataMigration(Connection conn) {
+
+    }
+
+    @Override
+    public InputStream[] getCleanupScripts() {
+        return new InputStream[0];
+    }
+}