etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/src/com/cloud/cluster
History
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
..
agentlb 2 fixes for Agent Load Balancer: 2011-07-21 15:43:52 -07:00
dao bug 10791: add data integrity check upon management server startup 2011-07-21 17:08:29 -07:00
CheckPointManager.java Add license header to files 2011-04-14 11:23:14 -07:00
CheckPointManagerImpl.java Add manager context to CleanupMaid to allow management service access in cleanup() method 2011-05-02 18:28:38 -07:00
CheckPointVO.java Add license header to files 2011-04-14 11:23:14 -07:00
CleanupMaid.java Add manager context to CleanupMaid to allow management service access in cleanup() method 2011-05-02 18:28:38 -07:00
ClusterAsyncExectuionListener.java Merge branch 'cvm' into 2.2.y 2011-08-19 16:08:35 -07:00
ClusterFenceManager.java Add license header to files 2011-04-14 11:23:14 -07:00
ClusterFenceManagerImpl.java Add license header to files 2011-04-14 11:23:14 -07:00
ClusterInvalidSessionException.java Add license header to files 2011-04-14 11:23:14 -07:00
ClusterManager.java bug 9127: covered failure scenarios for agent LB. 2011-06-05 17:35:30 -07:00
ClusterManagerImpl.java Merge branch '2.2.y' 2011-08-22 20:28:30 -07:00
ClusterManagerListener.java bug 9223, 9224: persist runid to form cluster session, based on cluster session and DB condition to issue isolation notification for self-fencing 2011-04-13 15:13:54 -07:00
ClusterManagerMBean.java Add license header to files 2011-04-14 11:23:14 -07:00
ClusterManagerMBeanImpl.java Add license header to files 2011-04-14 11:23:14 -07:00
ClusterManagerMessage.java bug 9127: intermediate checkin for agent load balancer 2011-05-24 18:45:00 -07:00
ClusterNodeJoinEventArgs.java Moved DAO to server 2010-11-22 07:40:41 -08:00
ClusterNodeLeftEventArgs.java Moved DAO to server 2010-11-22 07:40:41 -08:00
ClusterService.java bug 8558: improve cluster management 2011-03-09 17:18:48 -08:00
ClusterServiceAdapter.java Add license header to files 2011-04-14 11:23:14 -07:00
ClusterServiceServletAdapter.java Make cluster request timeout to be configurable 2011-07-14 18:23:23 -07:00
ClusterServiceServletContainer.java Add license header to files 2011-04-14 11:23:14 -07:00
ClusterServiceServletHttpHandler.java bug 10677: add client side time out to cluster servlet interface 2011-07-11 13:37:33 -07:00
ClusterServiceServletImpl.java Make cluster request timeout to be configurable 2011-07-14 18:23:23 -07:00
ClusteredAgentRebalanceService.java Some fixes to agent lb code: 2011-06-13 22:31:49 -07:00
DummyClusterManagerImpl.java bug 9127: covered failure scenarios for agent LB. 2011-06-05 17:35:30 -07:00
LockMasterListener.java bug 10322: Transaction is using the new Merovingian 2011-06-29 15:34:53 -07:00
ManagementServerHostVO.java bug 9127: covered failure scenarios for agent LB. 2011-06-05 17:35:30 -07:00
ManagementServerNode.java Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8 2011-07-27 17:41:38 -07:00
RemoteMethodConstants.java bug 8558: improve cluster management 2011-03-09 17:18:48 -08:00
StackMaid.java Add license header to files 2011-04-14 11:23:14 -07:00