David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							d630fa8697 
							
						 
					 
					
						
						
							
							license header changes for scripts folder from Chip Childers  
						
						
						
						
					 
					
						2012-06-23 00:58:00 -04:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							418cbe2e17 
							
						 
					 
					
						
						
							
							VPC : fixed get_domr_version  
						
						
						
						
					 
					
						2012-06-15 14:33:43 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							a4d0f91cfe 
							
						 
					 
					
						
						
							
							VPC : use routerProxy to call l2tpVpn  
						
						... 
						
						
						
						Conflicts:
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java 
						
						
					 
					
						2012-06-15 14:26:20 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							c75fe80125 
							
						 
					 
					
						
						
							
							VPC : use routerProxy to call networkUsage.sh  
						
						... 
						
						
						
						Conflicts:
	core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java 
						
						
					 
					
						2012-06-15 14:25:21 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							251a91f5b3 
							
						 
					 
					
						
						
							
							VCP : use routerProxy to call checkrouter script  
						
						
						
						
					 
					
						2012-06-15 14:24:18 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							8c1700a3a4 
							
						 
					 
					
						
						
							
							VPC : introduce router_proxy.sh, resource should use this as a proxy to call scripts inside domr  
						
						... 
						
						
						
						already did this for ipassoc and getDomRVersion 
						
						
					 
					
						2012-06-15 14:22:49 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							8581d02ee8 
							
						 
					 
					
						
						
							
							CS-14946, check if it is linux bridge before call ovs  
						
						
						
						
					 
					
						2012-05-23 19:06:35 -07:00 
						 
				 
			
				
					
						
							
							
								Salvatore Orlando 
							
						 
					 
					
						
						
						
						
							
						
						
							9f321ffeac 
							
						 
					 
					
						
						
							
							Open vSwitch tunnel manager  
						
						... 
						
						
						
						Applying patch with new ovs-tunnel-manager on top of cloudstack oss-master 
						
						
					 
					
						2012-04-23 22:32:16 +01:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a6d4a76647 
							
						 
					 
					
						
						
							
							bug 14498: in xenserver 6.0 and openvswitch enabled, reboot xenserver will lost link local bridge; the workaround is if the link local bridge is lost, create a new one; status 14498: resolved fixed; Reviewed-by: frank  
						
						
						
						
					 
					
						2012-03-26 17:15:03 -07:00 
						 
				 
			
				
					
						
							
							
								abhi 
							
						 
					 
					
						
						
						
						
							
						
						
							a560ec3001 
							
						 
					 
					
						
						
							
							removing the minor version number for comparisions for Xenserver 6.0  
						
						
						
						
					 
					
						2012-03-13 11:23:27 +05:30 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							7008e5a46b 
							
						 
					 
					
						
						
							
							bug 13734: allow dhcp requests and responses all the time  
						
						
						
						
					 
					
						2012-02-15 15:34:48 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							3a3d096a5c 
							
						 
					 
					
						
						
							
							it appears xs 6.0 allows iptables rules across the bridge without csp  
						
						
						
						
					 
					
						2012-02-13 15:53:45 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							08636d5802 
							
						 
					 
					
						
						
							
							bug 13060: check for resident vms as xapi will return vms running on other hosts in the cluster  
						
						
						
						
					 
					
						2012-01-17 18:37:59 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							af667d26b7 
							
						 
					 
					
						
						
							
							bug 13033: security rule prevents console access  
						
						
						
						
					 
					
						2012-01-12 15:35:25 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							5d54a3aef8 
							
						 
					 
					
						
						
							
							bug 13052: check if ebtables exists in can_bridge_firewall  
						
						... 
						
						
						
						status 13052: resolved fixed 
						
						
					 
					
						2012-01-12 11:34:31 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							f964c4d227 
							
						 
					 
					
						
						
							
							bug 10363 : cleanup vhd in primary storage if download template to primary storage fails  
						
						... 
						
						
						
						Conflicts:
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	scripts/vm/hypervisor/xenserver/vmops 
						
						
					 
					
						2012-01-10 13:56:29 -08:00 
						 
				 
			
				
					
						
							
							
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							6aa0560d37 
							
						 
					 
					
						
						
							
							bug 12917: security groups - icmp type/code validations.  
						
						
						
						
					 
					
						2012-01-06 19:33:07 +05:30 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							5aba3913bb 
							
						 
					 
					
						
						
							
							bug 12854: arp requests can also be used to poison arp caches  
						
						
						
						
					 
					
						2012-01-05 18:01:19 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							f138d15efb 
							
						 
					 
					
						
						
							
							bug 12854: arp and ip antispoof independent of the order of vm start  
						
						
						
						
					 
					
						2012-01-05 18:01:10 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							24894e2354 
							
						 
					 
					
						
						
							
							bug 11302: dont allow stuff like BPDUS, don't allow vms to connect to hypervisor  
						
						
						
						
					 
					
						2011-12-29 17:35:24 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							4718f194ef 
							
						 
					 
					
						
						
							
							bug 12772: typo  
						
						
						
						
					 
					
						2011-12-29 16:01:41 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							a51ee064ee 
							
						 
					 
					
						
						
							
							bug 11302: more efficient caching of keyword  
						
						
						
						
					 
					
						2011-12-29 16:01:41 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							c05903b2d0 
							
						 
					 
					
						
						
							
							bug 11302: support new CSP for SP2.  
						
						... 
						
						
						
						conditional check : --match-set vs --set
forgot to merge this in from 2.2.y 
						
						
					 
					
						2011-12-29 16:01:40 -08:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							363aea4aee 
							
						 
					 
					
						
						
							
							Bug 12731 - Ebtable rules are blocking all traffic going out of VMs in basic zone  
						
						... 
						
						
						
						status 12731: resolved fixed
reviewed-by: edison 
						
						
					 
					
						2011-12-22 15:04:15 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							61eab674d2 
							
						 
					 
					
						
						
							
							bug 12328: XenServer 6.0 changes vnc-port path in xenstore  
						
						... 
						
						
						
						status 12328: resolved fixed 
						
						
					 
					
						2011-12-21 12:00:27 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							2278477737 
							
						 
					 
					
						
						
							
							add stronger security to defend against attacks originating in the vm  
						
						
						
						
					 
					
						2011-12-19 10:56:52 -08:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							5393a44c56 
							
						 
					 
					
						
						
							
							bug 12290: improve antispoofing lgic  
						
						... 
						
						
						
						handle reboot within vm correctly
iptables -S missing in csp 
						
						
					 
					
						2011-12-19 10:56:52 -08:00 
						 
				 
			
				
					
						
							
							
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							0c1e21ab80 
							
						 
					 
					
						
						
							
							bug 10617: vmops related changes.  
						
						
						
						
					 
					
						2011-12-01 19:32:57 +05:30 
						 
				 
			
				
					
						
							
							
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							09905b641b 
							
						 
					 
					
						
						
							
							bug 10617: merge code from branch bug10617.  
						
						
						
						
					 
					
						2011-12-01 14:17:52 +05:30 
						 
				 
			
				
					
						
							
							
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							f1b99f4f07 
							
						 
					 
					
						
						
							
							Revert "bug 10617: merging code from branch bug10617"  
						
						... 
						
						
						
						This reverts commit 8bc33448b9220534ba0ddc6c642ffb1e69d5844e.
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java 
						
						
					 
					
						2011-11-11 20:23:26 +05:30 
						 
				 
			
				
					
						
							
							
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							02adbd4bd3 
							
						 
					 
					
						
						
							
							bug 10617: merging code from branch bug10617  
						
						
						
						
					 
					
						2011-11-10 15:23:48 +05:30 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							1c5adc7714 
							
						 
					 
					
						
						
							
							bug 11336: compression to allow number of cidrs to scale beyond 8k  
						
						
						
						
					 
					
						2011-10-06 17:56:59 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							1b3372e1de 
							
						 
					 
					
						
						
							
							bug 11625: separate out error paths to enable fine grained error handling and cleanup  
						
						... 
						
						
						
						status 11625: resolved fixed 
						
						
					 
					
						2011-10-06 17:55:29 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							61fa7d8675 
							
						 
					 
					
						
						
							
							bug 11420: reduce duration of disruption  
						
						
						
						
					 
					
						2011-10-06 17:55:21 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							89e45bd671 
							
						 
					 
					
						
						
							
							bug 11130: Add GetDomRVersionCmd  
						
						
						
						
					 
					
						2011-09-29 14:50:11 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3549067d55 
							
						 
					 
					
						
						
							
							bug 11307: Add BumpUpPriorityCommand  
						
						
						
						
					 
					
						2011-09-14 16:22:19 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							fae5e84699 
							
						 
					 
					
						
						
							
							if the xenserver host cannot do bridge firewalling do not attempt to retry the security rule updat  
						
						... 
						
						
						
						change some logs to debug level 
						
						
					 
					
						2011-09-12 18:20:24 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							65fb83035f 
							
						 
					 
					
						
						
							
							Enable monitoring over JMX  
						
						... 
						
						
						
						Add the ability to disable some vms from being scheduled
Add ability to trigger ruleset updates from JMX
added a few more dangerous JMX operations 
						
						
					 
					
						2011-09-12 18:20:24 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							0aeb45fafc 
							
						 
					 
					
						
						
							
							if sequence number increases but signature does not change, do not reprogram, but rewrite the rule log  
						
						
						
						
					 
					
						2011-09-12 18:20:23 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							53970c89dc 
							
						 
					 
					
						
						
							
							Revert "bug 10617: blocking between security groups for egress rules fixed."  
						
						... 
						
						
						
						revert pending review
This reverts commit 7d30dfd79e3c4b01492f606333c26e36bcdc5d13. 
						
						
					 
					
						2011-09-12 14:45:58 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							e216686029 
							
						 
					 
					
						
						
							
							Revert "bug 10617: Intermediate checking"  
						
						... 
						
						
						
						revert pending review
This reverts commit 561b27565512d438db3d8896df6f97b644b0b498. 
						
						
					 
					
						2011-09-12 14:45:58 -07:00 
						 
				 
			
				
					
						
							
							
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							f9b0962ad9 
							
						 
					 
					
						
						
							
							bug 10617: Intermediate checking  
						
						... 
						
						
						
						Changes :
         - Fixing API doc +response name + errorMessage
         - Adding seperate events to Egress rules
         - Egress rules Using the same database table as that of ingress with new column type.
   Pending Tasks:
         - db upgrade
         - database table rename from security_ingress_rule to generic name, renaming some of the jave class from ingress to generic name.
         - Retesting on kvm 
						
						
					 
					
						2011-09-09 18:14:19 +05:30 
						 
				 
			
				
					
						
							
							
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							10d2ca8d0a 
							
						 
					 
					
						
						
							
							bug 10617: blocking between security groups for egress rules fixed.  
						
						
						
						
					 
					
						2011-09-02 16:17:08 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							7621dea575 
							
						 
					 
					
						
						
							
							Fix the regression on security group cleanup:  
						
						... 
						
						
						
						In pre-2.2.10, the cleanup doens't work at all.
In 2.2.10, it works but make a mistake to delete all the rules for vmname ending with "-untagged" 
						
						
					 
					
						2011-08-31 10:45:52 -07: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 
						 
				 
			
				
					
						
							
							
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							4369b0ba96 
							
						 
					 
					
						
						
							
							bug 1067:  
						
						... 
						
						
						
						- covered basic impelementation for xen, need to test corner cases.
      - Not implemneted: kvm, vmware , listing of egress rules. 
						
						
					 
					
						2011-08-19 11:10:16 +05:30 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							8277584b8a 
							
						 
					 
					
						
						
							
							merge ELB / nectarine branch  
						
						
						
						
					 
					
						2011-08-08 15:20:56 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							736b6cf98e 
							
						 
					 
					
						
						
							
							properly clean up rules for nonexistent vms  
						
						
						
						
					 
					
						2011-08-04 22:58:42 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							0c408d8da5 
							
						 
					 
					
						
						
							
							handle elb vm restart  
						
						
						
						
					 
					
						2011-08-04 22:05:48 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							8d47c53735 
							
						 
					 
					
						
						
							
							Revert "bug 10435: removed vpn feature"  
						
						... 
						
						
						
						This reverts commit ea9e1b5d138950e8de49fce7ffdbb12a1c72c560.
Conflicts:
	api/src/com/cloud/api/ResponseGenerator.java
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2011-08-02 18:12:57 -07:00