Merge remote-tracking branch 'origin/main' into differential-snapshots

Author: JoaoJandre

.asf.yaml

@@ -52,8 +52,6 @@ github:
   collaborators:
     - acs-robot
     - rajujith
-    - GaOrtiga
-    - SadiJr
     - winterhazel
     - gpordeus
     - hsato03

debian/control

@@ -1,7 +1,7 @@
 Source: cloudstack
 Section: libs
 Priority: extra
-Maintainer: Wido den Hollander <[email protected]>
+Maintainer: The Apache CloudStack Team <[email protected]>
 Build-Depends: debhelper (>= 9), openjdk-17-jdk | java17-sdk | java17-jdk | zulu-17 | openjdk-11-jdk | java11-sdk | java11-jdk | zulu-11, genisoimage,
  python-mysql.connector | python3-mysql.connector | mysql-connector-python-py3, maven (>= 3) | maven3,
  python (>= 2.7) | python2 (>= 2.7), python3 (>= 3), python-setuptools, python3-setuptools,

engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql

@@ -34,7 +34,6 @@ AND NOT EXISTS(SELECT 1 FROM cloud.role_permissions rp_ WHERE rp.role_id = rp_.r
 
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.host', 'last_mgmt_server_id', 'bigint unsigned DEFAULT NULL COMMENT "last management server this host is connected to" AFTER `mgmt_server_id`');
 
-
 --- KVM Incremental Snapshots
 
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.snapshot_store_ref', 'kvm_checkpoint_path', 'varchar(255)');

ui/src/views/image/RegisterOrUploadTemplate.vue

@@ -214,7 +214,7 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row :gutter="12" v-if="allowed && (hyperKVMShow || hyperCustomShow) && currentForm === 'Create'">
+        <a-row :gutter="12" v-if="(hyperKVMShow || hyperCustomShow) && currentForm === 'Create'">
           <a-col :md="24" :lg="12">
             <a-form-item ref="directdownload" name="directdownload">
               <template #label>