mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
8a7feb8ec1
Conflicts: agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java api/src/com/cloud/agent/api/to/FirewallRuleTO.java api/src/com/cloud/agent/api/to/IpAddressTO.java api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java api/src/com/cloud/api/ApiConstants.java api/src/com/cloud/api/BaseCmd.java api/src/com/cloud/api/ResponseGenerator.java api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java api/src/com/cloud/api/commands/ListCapabilitiesCmd.java api/src/com/cloud/api/commands/UpdateNetworkCmd.java api/src/com/cloud/api/response/CapabilitiesResponse.java api/src/com/cloud/network/Network.java api/src/com/cloud/network/NetworkService.java api/src/com/cloud/network/firewall/FirewallService.java api/src/com/cloud/network/lb/LoadBalancingRule.java api/src/com/cloud/network/lb/LoadBalancingRulesService.java api/src/com/cloud/network/rules/FirewallRule.java api/src/com/cloud/network/rules/RulesService.java api/src/com/cloud/offering/NetworkOffering.java client/tomcatconf/commands.properties.in cloud.spec core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java core/src/com/cloud/storage/template/DownloadManagerImpl.java core/src/com/cloud/vm/DomainRouterVO.java debian/cloud-deps.install patches/systemvm/debian/config/etc/init.d/cloud-early-config patches/systemvm/debian/config/root/ipassoc.sh patches/systemvm/debian/config/root/loadbalancer.sh scripts/vm/hypervisor/kvm/rundomrpre.sh scripts/vm/hypervisor/xenserver/vmops server/src/com/cloud/agent/manager/AgentAttache.java server/src/com/cloud/agent/manager/AgentManagerImpl.java server/src/com/cloud/agent/manager/AgentMonitor.java server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java server/src/com/cloud/alert/ClusterAlertAdapter.java server/src/com/cloud/api/ApiResponseHelper.java server/src/com/cloud/api/ApiServer.java server/src/com/cloud/cluster/ClusterManagerImpl.java server/src/com/cloud/configuration/Config.java server/src/com/cloud/configuration/ConfigurationManager.java server/src/com/cloud/configuration/ConfigurationManagerImpl.java server/src/com/cloud/configuration/DefaultComponentLibrary.java server/src/com/cloud/deploy/FirstFitPlanner.java server/src/com/cloud/ha/HighAvailabilityManagerImpl.java server/src/com/cloud/host/dao/HostDaoImpl.java server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java server/src/com/cloud/network/LoadBalancerVO.java server/src/com/cloud/network/NetworkManager.java server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/dao/FirewallRulesDao.java server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java server/src/com/cloud/network/element/DhcpElement.java server/src/com/cloud/network/element/VirtualRouterElement.java server/src/com/cloud/network/firewall/FirewallManagerImpl.java server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java server/src/com/cloud/network/rules/FirewallManager.java server/src/com/cloud/network/rules/FirewallRuleVO.java server/src/com/cloud/network/rules/PortForwardingRuleVO.java server/src/com/cloud/network/rules/RulesManagerImpl.java server/src/com/cloud/network/rules/StaticNatRuleImpl.java server/src/com/cloud/network/security/SecurityGroupListener.java server/src/com/cloud/network/security/SecurityGroupManagerImpl.java server/src/com/cloud/offerings/NetworkOfferingVO.java server/src/com/cloud/server/ConfigurationServerImpl.java server/src/com/cloud/server/ManagementServerImpl.java server/src/com/cloud/storage/StorageManager.java server/src/com/cloud/storage/StorageManagerImpl.java server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java server/src/com/cloud/storage/download/DownloadMonitorImpl.java server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java server/src/com/cloud/upgrade/dao/Upgrade228to229.java server/src/com/cloud/upgrade/dao/Upgrade229to2210.java server/src/com/cloud/user/AccountManagerImpl.java server/src/com/cloud/vm/UserVmManagerImpl.java server/src/com/cloud/vm/VirtualMachineManagerImpl.java server/src/com/cloud/vm/dao/DomainRouterDao.java server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java setup/db/create-index-fk.sql setup/db/create-schema.sql setup/db/db/schema-222to224.sql setup/db/db/schema-227to228.sql setup/db/db/schema-228to229.sql setup/db/db/schema-229to2210.sql tools/testClient/README ui/scripts/cloud.core.instance.js utils/src/com/cloud/utils/SerialVersionUID.java utils/src/com/cloud/utils/db/ConnectionConcierge.java utils/src/com/cloud/utils/db/Merovingian2.java utils/src/com/cloud/utils/db/Transaction.java utils/src/com/cloud/utils/nio/Link.java utils/src/com/cloud/utils/nio/NioConnection.java utils/src/com/cloud/utils/time/InaccurateClock.java