Commit Graph

28 Commits

Author SHA1 Message Date
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
frank 9c1b8ef673 add copyright delcartion to all sql files 2012-01-11 17:31:10 -08:00
alena 8a7feb8ec1 Merge branch '2.2.y'
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
2011-08-22 20:28:30 -07:00
frank 44f3ac98f6 A couple of things:
add 229 upgrade path

Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8 (edit)

run checker before any components loaded
2011-07-29 20:05:50 -07:00
Alex Huang 70e0b54a83 Upgrade scripts for missing indexes 2011-07-27 17:56:16 -07:00
Alex Huang c610925304 moved agent ping to in memory rather than db based 2011-07-25 15:21:06 -07:00
Alex Huang 1b56808be5 brought over agent ping uses the same db connection 2011-07-25 10:57:00 -07:00
Alex Huang 03716ed5c6 propagate db upgrade 2011-07-22 16:31:59 -07:00
Alex Huang 3ecfddf130 Added db upgrade fro the indexes 2011-07-22 16:29:02 -07:00
Alex Huang 37c1401ad3 bug 10756: propagate to 2.2.8.z 2011-07-20 16:43:38 -07:00
Kelven Yang 281201be8e Make cluster request timeout to be configurable 2011-07-14 18:23:23 -07:00
Kelven Yang 61676ff3ea Make cluster request timeout to be configurable 2011-07-14 18:11:32 -07:00
Kelven Yang 72cbd65db2 bug 10668: add DB upgrade scripts for 2.2.7 to 2.2.8 upgrade 2011-07-08 18:12:13 -07:00
alena 62a570484c fix db upgrade from 2.2.6 to 2.2.8
Conflicts:

	setup/db/db/schema-227to228.sql
2011-07-08 09:51:50 -07:00
alena 27ef3a1d2d bug 10651: added missing keys to 227 to 228 db upgrade
status 10651: resolved fixed

Conflicts:

	setup/db/db/schema-227to228.sql
2011-07-08 09:49:19 -07:00
alena 4c075774a3 Revert "bug 10651: added unique_name to network_offerings for 227->228"
This reverts commit 5537e65129f669da7ca9a22e53cc3daa9e69ac97.

Reverting the fix because only the unique key was missing; the column was inserted as a part of 225 to 226 upgrade
2011-07-08 09:48:24 -07:00
alena 70b1c69ef3 bug 10651: added missing keys to 227 to 228 db upgrade
status 10651: resolved fixed
2011-07-08 09:45:12 -07:00
alena 1bdc0de98c Revert "bug 10651: added unique_name to network_offerings for 227->228"
This reverts commit 5537e65129f669da7ca9a22e53cc3daa9e69ac97.

Reverting the fix because only the unique key was missing; the column was inserted as a part of 225 to 226 upgrade
2011-07-08 09:19:05 -07:00
Abhinandan Prateek 786420b439 bug 10651: added unique_name to network_offerings for 227->228 2011-07-08 20:53:00 +05:30
Abhinandan Prateek 57a05c79ab bug 10651: added unique_name to network_offerings for 227->228 2011-07-08 20:48:32 +05:30
Edison Su d548e8fc38 fix db upgrade from 2.2.6 to 2.2.8 2011-07-01 19:16:14 -07:00
Kelven Yang 1edf772f92 bug 10480, 10494: NPE fix in VirtualMachineManagerImpl, move keystore upgrade sql to upgrade225to226.sql 2011-06-28 15:00:34 -07:00
Kelven Yang 0059dd0e57 bug 10480, 10494: NPE fix in VirtualMachineManagerImpl, move keystore upgrade sql to upgrade225to226.sql 2011-06-28 14:57:02 -07:00
alena 8002834581 Fixed bug in the comment 2011-06-28 14:07:45 -07:00
alena 33624efd2f Fixed bug in the comment 2011-06-28 14:07:28 -07:00
frank 317c1cc5c9 DB Upgrade: Add external_dhcp column to hot_pod_ref table 2011-06-28 14:06:45 -07:00
alena 56799fcbaa Added upgrade path from 2.2.7 to 2.2.8 2011-06-24 12:07:33 -07:00
alena 67be5512c8 Added upgrade path from 2.2.7 to 2.2.8 2011-06-24 11:31:08 -07:00