etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/scripts/vm/hypervisor/xenserver
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
..
xcpserver bug 10695: add XCP 1.0 support 2011-08-09 19:51:32 -07:00
xenserver56 VLAN patch for XenServer 5.6 2011-08-15 13:55:06 -07:00
xenserver56fp1 Copy missed getRouterStatus.sh to XenServer FP1 host 2011-08-16 14:21:32 -07:00
xenserver60 support XenServer 6.0 beta 2011-07-20 16:47:48 -07:00
check_heartbeat.sh add VERSION into to scripts 2011-03-23 14:54:31 -07:00
cloud-clean-vlan.sh bug 10197: add some scripts which is used in upgrade 2011-07-28 15:07:08 -07:00
cloud-prepare-upgrade.sh fixed the script 2011-08-16 15:24:34 -07:00
cloud-propagate-vlan.sh fixed script 2011-08-16 12:26:04 -07:00
cloud-setup-bonding.sh add VERSION into to scripts 2011-03-23 14:54:31 -07:00
copy_vhd_from_secondarystorage.sh For some NFS Servers, mount option tcp is required 2011-08-08 17:58:47 -07:00
copy_vhd_to_secondarystorage.sh For some NFS Servers, mount option tcp is required 2011-08-08 17:58:47 -07:00
create_privatetemplate_from_snapshot.sh For some NFS Servers, mount option tcp is required 2011-08-08 17:58:47 -07:00
fsimage.so merge premium xenserver scripts to oss 2011-01-28 17:42:27 -08:00
hostvmstats.py add VERSION into to scripts 2011-03-23 14:54:31 -07:00
launch_hb.sh add VERSION into to scripts 2011-03-23 14:54:31 -07:00
make_migratable.sh add VERSION into to scripts 2011-03-23 14:54:31 -07:00
network_info.sh add VERSION into to scripts 2011-03-23 14:54:31 -07:00
ovsgre add VERSION into to scripts 2011-03-23 14:54:31 -07:00
ovstunnel add VERSION into to scripts 2011-03-23 14:54:31 -07:00
setup_heartbeat_file.sh add VERSION into to scripts 2011-03-23 14:54:31 -07:00
setup_heartbeat_sr.sh add VERSION into to scripts 2011-03-23 14:54:31 -07:00
setup_iscsi.sh add VERSION into to scripts 2011-03-23 14:54:31 -07:00
setupxenserver.sh bug 10081: don't save iptable 2011-06-06 18:19:01 -07:00
swift swift integration checkin 2011-05-05 13:55:29 -07:00
upgrade_snapshot.sh For some NFS Servers, mount option tcp is required 2011-08-08 17:58:47 -07:00
vhd-util bug 6772: use vhd-util to coalesce snapshots into primary storage 2011-03-07 19:47:29 -08:00
vmops Merge branch '2.2.y' 2011-08-22 20:28:30 -07:00
vmopsSnapshot For some NFS Servers, mount option tcp is required 2011-08-08 17:58:47 -07:00
vmopspremium add VERSION into to scripts 2011-03-23 14:54:31 -07:00
xenheartbeat.sh merge premium xenserver scripts to oss 2011-01-28 17:42:27 -08:00
xs_cleanup.sh add VERSION into to scripts 2011-03-23 14:54:31 -07:00