apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-25 09:12:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

pre-commit: apply end-of-file-fixer to all files (#7551)

Browse Source
This commit is contained in:
John Bampton 2023-08-02 21:47:21 +10:00 committed by GitHub
parent e876ef096e
commit 6f4503488b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
359 changed files with 235 additions and 408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pre-commit-config.yaml
View File

@ -36,7 +36,7 @@ repos:
#- id: check-yaml
#- id: detect-private-key
- id: end-of-file-fixer
files: \.(java|md|py|txt|yaml|yml)$
exclude: \.vhd$
#- id: fix-byte-order-marker
- id: mixed-line-ending
files: \.(java|md|py|txt|yaml|yml)$

1
LICENSE
View File

@ -624,4 +624,3 @@ Within the utils/src/main/java/org/apache/commons/httpclient/contrib/ssl directo
from The Apache Software Foundation http://www.apache.org/
EasySSLProtocolSocketFactory.java
EasyX509TrustManager.java

2
api/src/main/resources/META-INF/cloudstack/api-planner/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=api-planner
parent=planner
parent=planner

2
core/src/main/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml
View File

@ -31,4 +31,4 @@
<bean id="usageEventUtils" class="com.cloud.event.UsageEventUtils" />
</beans>
</beans>

2
core/src/main/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml
View File

@ -41,4 +41,4 @@
value="com.cloud.consoleproxy.ConsoleProxyAllocator" />
</bean>
</beans>
</beans>

2
core/src/main/resources/META-INF/cloudstack/cloudstack/direct-download/module.properties
View File

@ -18,4 +18,4 @@
#
name=direct-download
parent=backend
parent=backend

2
core/src/main/resources/META-INF/cloudstack/core/spring-core-lifecycle-core-context-inheritable.xml
View File

@ -45,4 +45,4 @@
<property name="typeClass" value="org.apache.cloudstack.userdata.UserDataProvider" />
</bean>
</beans>
</beans>

2
core/src/main/resources/META-INF/cloudstack/kubernetes/module.properties
View File

@ -18,4 +18,4 @@
#
name=kubernetes
parent=compute
parent=compute

2
core/src/main/resources/META-INF/cloudstack/planner/module.properties
View File

@ -18,4 +18,4 @@
#
name=planner
parent=allocator
parent=allocator

2
debian/cloudstack-cli.install vendored
View File

@ -13,4 +13,4 @@
# "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.
# under the License.

2
debian/cloudstack-common.postinst vendored
View File

@ -32,4 +32,4 @@ fi
cp $CLOUDUTILS_DIR/cloud_utils.py $DIST_DIR
cp -R $CLOUDUTILS_DIR/cloudutils $DIST_DIR
python3 -m py_compile $DIST_DIR/cloud_utils.py
python3 -m compileall $DIST_DIR/cloudutils
python3 -m compileall $DIST_DIR/cloudutils

2
debian/cloudstack-docs.install vendored
View File

@ -13,4 +13,4 @@
# "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.
# under the License.

1
engine/schema/src/main/resources/META-INF/db/data-217to218.sql
View File

@ -17,4 +17,3 @@
INSERT INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'default.page.size', '500', 'Default page size for API list* commands');
DELETE FROM `cloud`.`op_host_capacity` WHERE `capacity_type` in (2,6);

1
engine/schema/src/main/resources/META-INF/db/schema-20to21.sql
View File

@ -198,4 +198,3 @@ CREATE TABLE `cloud`.`disk_offering_21` (
`created` datetime COMMENT 'date the disk offering was created',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

2
engine/schema/src/main/resources/META-INF/db/schema-21to22-cleanup.sql
View File

@ -79,5 +79,3 @@ UPDATE `cloud`.`vm_instance` SET last_host_id=NULL WHERE last_host_id NOT IN (SE
UPDATE `cloud`.`vm_instance` SET domain_id=1, account_id=1 where account_id not in (select distinct id from account) or domain_id not in (select distinct id from domain);
ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `fk_vm_instance__account_id` FOREIGN KEY `fk_vm_instance__account_id` (`account_id`) REFERENCES `account` (`id`);

3
engine/schema/src/main/resources/META-INF/db/schema-21to22-premium.sql
View File

@ -76,6 +76,3 @@ CREATE TABLE `cloud_usage`.`usage_network_offering` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
update `cloud_usage`.`usage_volume` set size = (size * 1048576);

1
engine/schema/src/main/resources/META-INF/db/schema-21to22.sql
View File

@ -1016,4 +1016,3 @@ INSERT INTO configuration (category, instance, component, name, value, descripti
DELETE FROM load_balancer_vm_map WHERE load_balancer_id NOT IN (SELECT id FROM load_balancer);
DELETE FROM vm_instance WHERE type='User' AND id NOT IN (SELECT id FROM user_vm);

1
engine/schema/src/main/resources/META-INF/db/schema-2210to2211.sql
View File

@ -14,4 +14,3 @@
-- KIND, either express or implied. See the License for the
-- specific language governing permissions and limitations
-- under the License.

1
engine/schema/src/main/resources/META-INF/db/schema-2211to2212.sql
View File

@ -60,4 +60,3 @@ CREATE TABLE IF NOT EXISTS `cloud`.`inline_load_balancer_nic_map` (
CONSTRAINT `fk_inline_load_balancer_nic_map__load_balancer_id` FOREIGN KEY(`load_balancer_id`) REFERENCES `load_balancing_rules`(`id`) ON DELETE CASCADE,
CONSTRAINT `fk_inline_load_balancer_nic_map__nic_id` FOREIGN KEY(`nic_id`) REFERENCES `nics`(`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

1
engine/schema/src/main/resources/META-INF/db/schema-2212to2213.sql
View File

@ -80,4 +80,3 @@ INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-serv
INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'vm.destory.forcestop', 'false', 'On destory, force-stop takes this value');
INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.lock.timeout', '600', 'Lock wait timeout (seconds) while implementing network');
INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.disable.rpfilter','true','disable rp_filter on Domain Router VM public interfaces.');

1
engine/schema/src/main/resources/META-INF/db/schema-2213to2214.sql
View File

@ -87,4 +87,3 @@ ALTER TABLE `cloud_usage`.`user_statistics` MODIFY `device_type` varchar(32) NOT
ALTER TABLE `cloud`.`keystore` ADD seq int;
ALTER TABLE `cloud`.`keystore` MODIFY `cloud`.`keystore`.`key` text;

1
engine/schema/src/main/resources/META-INF/db/schema-2214to30-cleanup.sql
View File

@ -65,4 +65,3 @@ DROP TABLE IF EXISTS `cloud`.`network_tags`;
DROP TABLE IF EXISTS `cloud_usage`.`event`;
DELETE from `cloud`.`guest_os` where id=204 or id=205;

1
engine/schema/src/main/resources/META-INF/db/schema-221to222-cleanup.sql
View File

@ -17,4 +17,3 @@
alter table firewall_rules drop column is_static_nat;
delete from configuration where name='router.cleanup';

2
engine/schema/src/main/resources/META-INF/db/schema-221to222.sql
View File

@ -52,5 +52,3 @@ CREATE TABLE IF NOT EXISTS `cloud`.`version` (
PRIMARY KEY (`id`),
INDEX `i_version__version`(`version`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

1
engine/schema/src/main/resources/META-INF/db/schema-222to224-premium.sql
View File

@ -21,4 +21,3 @@
ALTER TABLE `cloud_usage`.`usage_vm_instance` ADD COLUMN `hypervisor_type` varchar(255);
ALTER TABLE `cloud_usage`.`usage_event` ADD COLUMN `resource_type` varchar(32);

1
engine/schema/src/main/resources/META-INF/db/schema-222to224.sql
View File

@ -193,4 +193,3 @@ UPDATE `cloud`.`nics` SET strategy='Create' where reserver_name='DirectNetworkGu
UPDATE storage_pool SET cluster_id=(SELECT cluster_id FROM host INNER JOIN storage_pool_host_ref WHERE host.id=storage_pool_host_ref.host_id AND storage_pool_host_ref.pool_id=storage_pool.id) WHERE pool_type='LVM';
UPDATE `cloud`.`host` SET resource='com.cloud.hypervisor.xen.resource.XenServer56FP1Resource' WHERE resource='com.cloud.hypervisor.xen.resource.XenServer56FP1PremiumResource';

1
engine/schema/src/main/resources/META-INF/db/schema-224to225.sql
View File

@ -64,4 +64,3 @@ ALTER TABLE `cloud`.`user_statistics` MODIFY `device_id` bigint(20) unsigned NOT
ALTER TABLE `cloud`.`user_statistics` MODIFY `device_type` varchar(32) NOT NULL;
ALTER TABLE `cloud`.`nics` MODIFY `ip6_address` char(40);

1
engine/schema/src/main/resources/META-INF/db/schema-225to226.sql
View File

@ -49,4 +49,3 @@ CREATE TABLE IF NOT EXISTS `cloud`.`cmd_exec_log` (
INDEX `i_cmd_exec_log__instance_id`(`instance_id`),
CONSTRAINT `fk_cmd_exec_log_ref__inst_id` FOREIGN KEY (`instance_id`) REFERENCES `vm_instance`(`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

1
engine/schema/src/main/resources/META-INF/db/schema-227to228-premium.sql
View File

@ -34,4 +34,3 @@ drop table `cloud_usage`.`temp_usage`;
update `cloud_usage`.`cloud_usage` set raw_usage = (raw_usage % 24) where usage_type =6 and raw_usage > 24 and (raw_usage % 24) <> 0;
update `cloud_usage`.`cloud_usage` set raw_usage = 24 where usage_type =6 and raw_usage > 24 and (raw_usage % 24) = 0;

2
engine/schema/src/main/resources/META-INF/db/schema-227to228.sql
View File

@ -164,5 +164,3 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'manag
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Console Proxy', 'DEFAULT', 'AgentManager', 'consoleproxy.management.state', 'Auto', 'console proxy service management state');
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Console Proxy', 'DEFAULT', 'AgentManager', 'consoleproxy.management.state.last', 'Auto', 'last console proxy service management state');
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'cluster.message.timeout.seconds', '300', 'Time (in seconds) to wait before a inter-management server message post times out.');

2
engine/schema/src/main/resources/META-INF/db/schema-228to229.sql
View File

@ -92,5 +92,3 @@ CREATE TABLE `cloud`.`elastic_lb_vm_map` (
CONSTRAINT `fk_elastic_lb_vm_map__elb_vm_id` FOREIGN KEY `fk_elastic_lb_vm_map__elb_vm_id` (`elb_vm_id`) REFERENCES `vm_instance` (`id`) ON DELETE CASCADE,
CONSTRAINT `fk_elastic_lb_vm_map__lb_id` FOREIGN KEY `fk_elastic_lb_vm_map__lb_id` (`lb_id`) REFERENCES `load_balancing_rules` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

2
engine/schema/src/main/resources/META-INF/db/schema-22beta3to22beta4.sql
View File

@ -124,5 +124,3 @@ ALTER TABLE `cloud`.`security_group` ADD CONSTRAINT `fk_security_group___account
DROP VIEW `cloud`.`user_ip_address_view`;
CREATE VIEW `cloud`.`user_ip_address_view` AS SELECT INET_NTOA(user_ip_address.public_ip_address) as ip_address, user_ip_address.data_center_id, user_ip_address.account_id, user_ip_address.domain_id, user_ip_address.source_nat, user_ip_address.allocated, user_ip_address.vlan_db_id, user_ip_address.one_to_one_nat, user_ip_address.state, user_ip_address.mac_address, user_ip_address.network_id as associated_network_id from user_ip_address;

1
engine/schema/src/main/resources/META-INF/db/schema-304to305-cleanup.sql
View File

@ -19,4 +19,3 @@
ALTER TABLE `cloud`.`domain_router` DROP COLUMN network_id;

2
engine/schema/src/main/resources/META-INF/db/schema-305to306-cleanup.sql
View File

@ -23,4 +23,4 @@ DELETE FROM `cloud`.`configuration` where `cloud`.`configuration`.`name`="vm.hos
DELETE FROM `cloud`.`storage_pool_host_ref` WHERE `cloud`.`storage_pool_host_ref`.`pool_id` IN (SELECT `cloud`.`storage_pool`.`id` FROM `cloud`.`storage_pool` WHERE `cloud`.`storage_pool`.`removed` IS NOT NULL);
ALTER TABLE `cloud`.`sync_queue` DROP COLUMN queue_proc_msid;
ALTER TABLE `cloud`.`sync_queue` DROP COLUMN queue_proc_time;
ALTER TABLE `cloud`.`sync_queue` DROP COLUMN queue_proc_time;

2
engine/schema/src/main/resources/META-INF/db/schema-306to307.sql
View File

@ -19,4 +19,4 @@
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.max.conn', '4096', 'Load Balancer(haproxy) maximum number of concurrent connections(global max)');
ALTER TABLE `cloud`.`network_offerings` ADD COLUMN `concurrent_connections` int(10) unsigned COMMENT 'concurrent connections supported on this network';
ALTER TABLE `cloud`.`network_offerings` ADD COLUMN `concurrent_connections` int(10) unsigned COMMENT 'concurrent connections supported on this network';

6
engine/schema/src/main/resources/META-INF/db/schema-307to410-cleanup.sql
View File

@ -35,9 +35,3 @@ ALTER TABLE `cloud_usage`.`cloud_usage` CHANGE COLUMN `virtual_size1` `virtual_s
ALTER TABLE `cloud`.`network_offerings` DROP COLUMN `concurrent_connections`;
ALTER TABLE `cloud`.`network_offerings` CHANGE COLUMN `concurrent_connections1` `concurrent_connections` int(10) unsigned COMMENT 'Load Balancer(haproxy) maximum number of concurrent connections(global max)';

1
engine/schema/src/main/resources/META-INF/db/schema-40to410-cleanup.sql
View File

@ -18,4 +18,3 @@
--;
-- Schema cleanup from 4.0.0 to 4.1.0;
--;

1
engine/schema/src/main/resources/META-INF/db/schema-40to410.sql
View File

@ -1668,4 +1668,3 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'manag
UPDATE `cloud`.`configuration` set category='Advanced' where category='Advanced ';
UPDATE `cloud`.`configuration` set category='Hidden' where category='Hidden ';

2
engine/schema/src/main/resources/META-INF/db/schema-41000to41100-cleanup.sql
View File

@ -66,4 +66,4 @@ CREATE VIEW `cloud`.`user_view` AS
left join
`cloud`.`async_job` ON async_job.instance_id = user.id
and async_job.instance_type = 'User'
and async_job.job_status = 0;
and async_job.job_status = 0;

2
engine/schema/src/main/resources/META-INF/db/schema-410to420-cleanup.sql
View File

@ -24,5 +24,3 @@ ALTER TABLE `cloud`.`remote_access_vpn` DROP foreign key `fk_remote_access_vpn__
ALTER TABLE `cloud`.`remote_access_vpn` DROP primary key;
ALTER TABLE `cloud`.`remote_access_vpn` ADD primary key (`id`);
ALTER TABLE `cloud`.`remote_access_vpn` ADD CONSTRAINT `fk_remote_access_vpn__vpn_server_addr_id` FOREIGN KEY (`vpn_server_addr_id`) REFERENCES `user_ip_address` (`id`);

2
engine/schema/src/main/resources/META-INF/db/schema-41110to41120.sql
View File

@ -27,4 +27,4 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervis
ALTER TABLE `cloud`.`user_vm_clone_setting`
ADD COLUMN `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT FIRST,
DROP PRIMARY KEY,
ADD PRIMARY KEY (`id`);
ADD PRIMARY KEY (`id`);

1
engine/schema/src/main/resources/META-INF/db/schema-41500to41510-cleanup.sql
View File

@ -18,4 +18,3 @@
--;
-- Schema upgrade cleanup from 4.15.0.0 to 4.15.1.0
--;

1
engine/schema/src/main/resources/META-INF/db/schema-41500to41510.sql
View File

@ -35,4 +35,3 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervis
-- Add support for VMware 7.0.1.0
INSERT IGNORE INTO `cloud`.`hypervisor_capabilities` (uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, vm_snapshot_enabled) values (UUID(), 'VMware', '7.0.1.0', 1024, 0, 59, 64, 1, 1);
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) SELECT UUID(),'VMware', '7.0.1.0', guest_os_name, guest_os_id, utc_timestamp(), 0 FROM `cloud`.`guest_os_hypervisor` WHERE hypervisor_type='VMware' AND hypervisor_version='7.0';

1
engine/schema/src/main/resources/META-INF/db/schema-41510to41520-cleanup.sql
View File

@ -18,4 +18,3 @@
--;
-- Schema upgrade cleanup from 4.15.1.0 to 4.15.2.0
--;

2
engine/schema/src/main/resources/META-INF/db/schema-41600to41610-cleanup.sql
View File

@ -17,4 +17,4 @@
--;
-- Schema upgrade cleanup from 4.16.0.0 to 4.16.1.0
--;
--;

2
engine/schema/src/main/resources/META-INF/db/schema-41610to41700-cleanup.sql
View File

@ -17,4 +17,4 @@
--;
-- Schema upgrade cleanup from 4.16.1.0 to 4.17.0.0
--;
--;

2
engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql
View File

@ -968,4 +968,4 @@ WHERE not exists( SELECT 1
;END;
CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (2, 'Debian GNU/Linux 11 (64-bit)', 'XenServer', '8.2.1', 'Debian Bullseye 11');
CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (2, 'Debian GNU/Linux 11 (32-bit)', 'XenServer', '8.2.1', 'Debian Bullseye 11');
CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (2, 'Debian GNU/Linux 11 (32-bit)', 'XenServer', '8.2.1', 'Debian Bullseye 11');

2
engine/schema/src/main/resources/META-INF/db/schema-41700to41710-cleanup.sql
View File

@ -17,4 +17,4 @@
--;
-- Schema upgrade cleanup from 4.17.0.0 to 4.17.1.0
--;
--;

2
engine/schema/src/main/resources/META-INF/db/schema-41700to41710.sql
View File

@ -128,4 +128,4 @@ CREATE VIEW `cloud`.`domain_router_view` AS
and async_job.job_status = 0;
-- PR #6080 Change column `value` size from 255 to 4096 characters, matching the API "updateConfiguration" "value" size
ALTER TABLE `cloud`.`account_details` MODIFY `value` VARCHAR(4096) NOT NULL;
ALTER TABLE `cloud`.`account_details` MODIFY `value` VARCHAR(4096) NOT NULL;

1
engine/schema/src/main/resources/META-INF/db/schema-421to430-cleanup.sql
View File

@ -18,4 +18,3 @@
--;
-- Schema cleanup from 4.2.0 to 4.3.0;
--;

1
engine/schema/src/main/resources/META-INF/db/schema-441to442.sql
View File

@ -18,4 +18,3 @@
--;
-- Schema upgrade from 4.4.1 to 4.4.2;
--;

2
engine/schema/src/main/resources/META-INF/db/schema-442to450-cleanup.sql
View File

@ -30,4 +30,4 @@ Where name = 'xen.nics.max';
UPDATE `cloud`.`configuration`
SET value = 'XenServer'
Where value = 'Xen';
Where value = 'Xen';

1
engine/schema/src/main/resources/META-INF/db/schema-452to460-cleanup.sql
View File

@ -20,4 +20,3 @@
--
DELETE FROM `cloud`.`configuration` where name='router.reboot.when.outofband.migrated';

2
engine/schema/src/main/resources/META-INF/db/schema-452to460.sql
View File

@ -419,5 +419,3 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervis
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'KVM', 'default', 'CentOS 7', 246, utc_timestamp(), 0);
UPDATE `cloud`.`hypervisor_capabilities` SET `max_data_volumes_limit` = '32' WHERE `hypervisor_capabilities`.`hypervisor_type` = 'KVM';

1
engine/schema/src/main/resources/META-INF/db/schema-461to470.sql
View File

@ -250,4 +250,3 @@ CREATE VIEW `cloud`.`domain_router_view` AS
INSERT IGNORE INTO `cloud`.`hypervisor_capabilities` values (25,UUID(),'VMware','6.0',128,0,13,32,1,1);
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'VMware', '5.5', 'rhel7_64Guest', 245, utc_timestamp(), 0);
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) SELECT UUID(),'VMware', '6.0', guest_os_name, guest_os_id, utc_timestamp(), 0 FROM `cloud`.`guest_os_hypervisor` WHERE hypervisor_type='VMware' AND hypervisor_version='5.5' AND (guest_os_id NOT IN (1,2,3,4,62,63,64,65,156,157,221,222) AND guest_os_id NOT BETWEEN 121 AND 130);

1
engine/schema/src/main/resources/META-INF/db/schema-480to481.sql
View File

@ -18,4 +18,3 @@
--;
-- Schema upgrade from 4.8.0 to 4.8.1;
--;

1
engine/schema/src/main/resources/META-INF/db/schema-481to490-cleanup.sql
View File

@ -268,4 +268,3 @@ CREATE VIEW `cloud`.`user_view` AS
`cloud`.`async_job` ON async_job.instance_id = user.id
and async_job.instance_type = 'User'
and async_job.job_status = 0;

1
engine/schema/src/main/resources/META-INF/db/schema-490to4910-cleanup.sql
View File

@ -18,4 +18,3 @@
--;
-- Schema cleanup from 4.9.0 to 4.9.1.0;
--;

1
engine/schema/src/main/resources/META-INF/db/schema-4910to4920-cleanup.sql
View File

@ -18,4 +18,3 @@
--;
-- Schema cleanup from 4.9.1.0 to 4.9.2.0;
--;

2
engine/storage/snapshot/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml
View File

@ -36,4 +36,4 @@
<bean id="snapshotStateMachineManagerImpl"
class="org.apache.cloudstack.storage.snapshot.SnapshotStateMachineManagerImpl" />
</beans>
</beans>

2
engine/storage/src/main/resources/META-INF/cloudstack/storage-allocator/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=storage-allocator
parent=storage
parent=storage

2
engine/storage/volume/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-volume-core-context.xml
View File

@ -46,4 +46,4 @@
<bean id="primaryDataStoreProviderMgr"
class="org.apache.cloudstack.storage.datastore.manager.PrimaryDataStoreProviderManagerImpl" />
</beans>
</beans>

2
engine/storage/volume/src/test/resource/testContext.xml
View File

@ -76,4 +76,4 @@
<bean id="eventBus" class = "org.apache.cloudstack.framework.eventbus.EventBusBase" />
</beans>
</beans>

2
engine/userdata/src/main/resources/META-INF/cloudstack/core/spring-engine-userdata-core-context.xml
View File

@ -31,4 +31,4 @@
<property name="userDataProviders" value="#{userDataProvidersRegistry.registered}" />
</bean>
</beans>
</beans>

2
framework/db/src/test/resources/db.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
# Just here to make the unit test not blow up
# Just here to make the unit test not blow up

2
framework/direct-download/pom.xml
View File

@ -35,4 +35,4 @@
<version>4.19.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
</project>

2
framework/ipc/src/main/resources/META-INF/cloudstack/core/spring-framework-ipc-core-context.xml
View File

@ -56,4 +56,4 @@
<bean id="messageBus" class = "org.apache.cloudstack.framework.messagebus.MessageBusBase" />
</beans>
</beans>

1
framework/jobs/src/test/resources/log4j.properties
View File

@ -32,4 +32,3 @@ log4j.category.org.apache=DEBUG, rolling, stdout
#log4j.category.com.cloud.utils.db.Transaction=ALL
log4j.category.org.apache.cloudstack.network.contrail=ALL
log4j.category.com.cloud.network=ALL

1
framework/spring/module/src/test/resources/testfiles/all/test2-defaults.properties
View File

@ -14,4 +14,3 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

1
framework/spring/module/src/test/resources/testfiles/missingname/module.properties
View File

@ -14,4 +14,3 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

2
framework/spring/module/src/test/resources/testhierarchy/excluded/module.properties
View File

@ -16,4 +16,4 @@
# under the License.
name=excluded
parent=base
parent=base

2
framework/spring/module/src/test/resources/testhierarchy/excluded2/module.properties
View File

@ -16,4 +16,4 @@
# under the License.
name=excluded2
parent=base
parent=base

2
framework/spring/module/src/test/resources/testhierarchy/orphan-of-excluded/defaults.properties
View File

@ -17,4 +17,4 @@
modules.include.excluded=false
modules.include.base=True
modules.exclude=excluded2,excluded2
modules.exclude=excluded2,excluded2

2
framework/spring/module/src/test/resources/testhierarchy/orphan-of-excluded/module.properties
View File

@ -16,4 +16,4 @@
# under the License.
name=orphan-of-excluded
parent=excluded
parent=excluded

1
packaging/centos7/cloud-ipallocator.rc
View File

@ -93,4 +93,3 @@ case "$1" in
esac
exit $RETVAL

1
packaging/centos7/cloud.spec
View File

@ -714,4 +714,3 @@ pip3 install --upgrade urllib3
* Fri Oct 5 2012 Hugo Trippaers <hugo@apache.org> 4.1.0
- new style spec file

1
packaging/centos8/cloud-ipallocator.rc
View File

@ -93,4 +93,3 @@ case "$1" in
esac
exit $RETVAL

2
plugins/acl/project-role-based/src/main/resources/META-INF/cloudstack/acl-project-role-based/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=acl-project-role-based
parent=api
parent=api

2
plugins/acl/static-role-based/src/main/resources/META-INF/cloudstack/acl-static-role-based/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=acl-static-role-based
parent=api
parent=api

2
plugins/affinity-group-processors/explicit-dedication/src/main/resources/META-INF/cloudstack/explicit-dedication/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=explicit-dedication
parent=planner
parent=planner

2
plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=host-affinity
parent=planner
parent=planner

2
plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity/spring-host-affinity-context.xml
View File

@ -32,4 +32,4 @@
<property name="name" value="HostAffinityProcessor" />
<property name="type" value="host affinity" />
</bean>
</beans>
</beans>

2
plugins/affinity-group-processors/host-anti-affinity/src/main/resources/META-INF/cloudstack/host-anti-affinity/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=host-anti-affinity
parent=planner
parent=planner

2
plugins/api/rate-limit/src/main/resources/META-INF/cloudstack/rate-limit/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=rate-limit
parent=api
parent=api

2
plugins/api/solidfire-intg-test/src/main/resources/META-INF/cloudstack/solidfire-intg-test/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=solidfire-intg-test
parent=api
parent=api

2
plugins/api/vmware-sioc/src/main/resources/META-INF/cloudstack/vmware-sioc/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=vmware-sioc
parent=api
parent=api

2
plugins/backup/networker/src/main/resources/META-INF/cloudstack/networker/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=networker
parent=backup
parent=backup

1
plugins/backup/networker/src/main/resources/META-INF/cloudstack/networker/spring-backup-networker-context.xml
View File

@ -24,4 +24,3 @@
<property name="name" value="networker"/>
</bean>
</beans>

2
plugins/deployment-planners/implicit-dedication/src/main/resources/META-INF/cloudstack/implicit-dedication/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=implicit-dedication
parent=planner
parent=planner

2
plugins/deployment-planners/user-concentrated-pod/src/main/resources/META-INF/cloudstack/user-concentrated-pod/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=user-concentrated-pod
parent=planner
parent=planner

1
plugins/ha-planners/skip-heurestics/src/main/resources/META-INF/cloudstack/skip-heurestics/spring-skip-heurestics-context.xml
View File

@ -23,4 +23,3 @@
</beans>

2
plugins/host-allocators/random/src/main/resources/META-INF/cloudstack/host-allocator-random/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=host-allocator-random
parent=allocator
parent=allocator

2
plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-compute/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=baremetal-compute
parent=compute
parent=compute

2
plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-discoverer/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=baremetal-discoverer
parent=discoverer
parent=discoverer

2
plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-network/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=baremetal-network
parent=network
parent=network

2
plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-planner/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=baremetal-planner
parent=planner
parent=planner

2
plugins/hypervisors/baremetal/src/main/resources/META-INF/cloudstack/baremetal-storage/module.properties
View File

@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
name=baremetal-storage
parent=storage
parent=storage

1
plugins/hypervisors/hyperv/DotNet/ServerResource/.gitignore vendored
View File

@ -23,4 +23,3 @@ AgentShell/bin/*
ServerResource*/bin/*
*.user
!.nuget/

2
plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentShell.csproj
View File

@ -148,4 +148,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

2
plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config
View File

@ -143,4 +143,4 @@
</setting>
</CloudStack.Plugin.AgentShell.AgentSettings>
</userSettings>
</configuration>
</configuration>

Some files were not shown because too many files have changed in this diff Show More