Merge remote-tracking branch 'origin/4.18' into 4.19

engine/schema/src/main/java/com/cloud/usage/dao/UsageDaoImpl.java

@@ -547,16 +547,11 @@ public class UsageDaoImpl extends GenericDaoBase<UsageVO, Long> implements Usage
                 TransactionLegacy txn = TransactionLegacy.currentTxn();
                 PreparedStatement pstmt = null;
                 try {
-                    txn.start();
                     pstmt = txn.prepareAutoCloseStatement(DELETE_ALL_BY_INTERVAL);
                     pstmt.setLong(1, days);
                     pstmt.executeUpdate();
-                    txn.commit();
                 } catch (Exception ex) {
-                    txn.rollback();
                     s_logger.error("error removing old cloud_usage records for interval: " + days);
-                } finally {
-                    txn.close();
                 }
             }
         });

ui/src/views/compute/KubernetesServiceTab.vue

@@ -402,6 +402,7 @@ export default {
           if (this.arrayHasItems(networks)) {
             this.network = networks[0]
           }
+          resolve(this.network)
         })
         this.networkLoading = false
       })