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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							37dcec77bb 
							
						 
					 
					
						
						
							
							Bug 10197:  
						
						 
						
						... 
						
						
						
						implement pool-wise VM sync,
    For XenServer, VM fullSync is pool-wise now, VM deltaSync is still per host
Conflicts:
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java 
						
						
					 
					
						2011-08-02 17:31:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							bba811a714 
							
						 
					 
					
						
						
							
							Bug 10197:  
						
						 
						
						... 
						
						
						
						1. don't try HA vms if host hypervisor version changes
    2. fixed a bug related to VM full sync with hosttrack enabled 
						
						
					 
					
						2011-08-02 17:29:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							dc7ff2b5ad 
							
						 
					 
					
						
						
							
							Bug 10197:  
						
						 
						
						... 
						
						
						
						implement pool-wise VM sync,
    For XenServer, VM fullSync is pool-wise now, VM deltaSync is still per host 
						
						
					 
					
						2011-08-02 16:52:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							5f9884d97a 
							
						 
					 
					
						
						
							
							Bug 10197:  
						
						 
						
						... 
						
						
						
						1. don't try HA vms if host hypervisor version changes
    2. fixed a bug related to VM full sync with hosttrack enabled 
						
						
					 
					
						2011-08-02 16:48:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f043f63eaa 
							
						 
					 
					
						
						
							
							Merged changes from 2.2.8.zucchini  
						
						 
						
						
						
						
					 
					
						2011-08-02 15:33:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							4f3dec5f1c 
							
						 
					 
					
						
						
							
							bug 10812:  adding domain suffixes to zone's router conf  
						
						 
						
						
						
						
					 
					
						2011-08-02 11:34:38 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							5cb3882349 
							
						 
					 
					
						
						
							
							bug 10812: adding domain suffixes to zone's router conf  
						
						 
						
						
						
						
					 
					
						2011-08-02 11:23:33 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							46be774ce8 
							
						 
					 
					
						
						
							
							bug 10812: adding domain suffixes to zone's router conf  
						
						 
						
						
						
						
					 
					
						2011-08-02 11:08:24 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							04528c821b 
							
						 
					 
					
						
						
							
							bug 10929: allow only OperationFailedToError event to trigger transition to Error state.  
						
						 
						
						
						
						
					 
					
						2011-08-01 18:40:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a6a2383561 
							
						 
					 
					
						
						
							
							bug 10929: allow only OperationFailedToError event to trigger transition to Error state.  
						
						 
						
						
						
						
					 
					
						2011-08-01 18:38:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							40f42a784f 
							
						 
					 
					
						
						
							
							bug 10929: allow only OperationFailedToError event to trigger transition to Error state.  
						
						 
						
						
						
						
					 
					
						2011-08-01 18:33:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							0bc6026d6b 
							
						 
					 
					
						
						
							
							fix description of addcluster api, and a typo in one script  
						
						 
						
						
						
						
					 
					
						2011-08-01 14:28:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							f4f51f0451 
							
						 
					 
					
						
						
							
							Revert "bug 10812: modifying dhcp option 119 on domR as per zone config"  
						
						 
						
						... 
						
						
						
						This reverts commit 606ec843475911680adb743d7975bf7d584ab240. 
						
						
					 
					
						2011-08-01 13:00:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							826a3d6ad0 
							
						 
					 
					
						
						
							
							bug 10812: modifying dhcp option 119 on domR as per zone config  
						
						 
						
						... 
						
						
						
						status 10812: resolved fixed. 
						
						
					 
					
						2011-08-01 14:44:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							68f9ab5c5c 
							
						 
					 
					
						
						
							
							DeleteLoadBalancer on invalid id throws NPE  
						
						 
						
						
						
						
					 
					
						2011-07-29 23:21:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							93244b5b62 
							
						 
					 
					
						
						
							
							Bug 10197:  if VM is already running, just return the host it is running on  
						
						 
						
						
						
						
					 
					
						2011-07-29 16:33:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							31100824d7 
							
						 
					 
					
						
						
							
							Bug 10197:  if VM is already running, just return the host it is running on  
						
						 
						
						
						
						
					 
					
						2011-07-29 16:33:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							b0b3f16dae 
							
						 
					 
					
						
						
							
							Two things:  
						
						 
						
						... 
						
						
						
						Load non-routing resource in ClusteredAgentManager includes External DHCP, PxeServer, ExternalFirewall, ExternalLoadBalancer
Bug 9887 - baremetal: support for image operation (create template from guest disk) (edit)
changes in line with UI 
						
						
					 
					
						2011-07-29 11:28:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							055ec48ae8 
							
						 
					 
					
						
						
							
							Two things:  
						
						 
						
						... 
						
						
						
						Load non-routing resource in ClusteredAgentManager includes External DHCP, PxeServer, ExternalFirewall, ExternalLoadBalancer
Bug 9887 - baremetal: support for image operation (create template from guest disk) (edit)
changes in line with UI 
						
						
					 
					
						2011-07-29 11:25:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							055e5c82c7 
							
						 
					 
					
						
						
							
							bug 9997:  
						
						 
						
						... 
						
						
						
						put copy scripts in SetupCommand,
1. initiate returns host version,
2. if it doesn't match with DB, update DB, and reconnect the host.
status 9997: resolved fixed 
						
						
					 
					
						2011-07-29 10:45:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c074b2d63f 
							
						 
					 
					
						
						
							
							cloudStack - Elastic Load Balancer - fix a server-side bug "unhandled exception executing api command: listLoadBalancerRules"  
						
						 
						
						
						
						
					 
					
						2011-07-28 19:11:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							1471b0a97a 
							
						 
					 
					
						
						
							
							Add parameter to ListPublicIpAddressCmd : forloadbalancing  
						
						 
						
						
						
						
					 
					
						2011-07-28 14:38:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							a6b1453254 
							
						 
					 
					
						
						
							
							minor cleanup  
						
						 
						
						
						
						
					 
					
						2011-07-28 14:38:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c948ff3611 
							
						 
					 
					
						
						
							
							moved security ingress command to trace  
						
						 
						
						
						
						
					 
					
						2011-07-28 11:07:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							15d57cef9f 
							
						 
					 
					
						
						
							
							bug 10557: implemented the TODO - opening the stats port using iptable  
						
						 
						
						
						
						
					 
					
						2011-07-28 17:28:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							2fc7be14de 
							
						 
					 
					
						
						
							
							bug 10557: implemented the TODO - opening the stats port using iptable  
						
						 
						
						
						
						
					 
					
						2011-07-28 17:24:10 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							2971e77401 
							
						 
					 
					
						
						
							
							change supportELB to report on which ips the ELB runs guest or public  
						
						 
						
						
						
						
					 
					
						2011-07-28 00:39:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							2162cdf283 
							
						 
					 
					
						
						
							
							WIP2: make creating an ELB bullet proof  
						
						 
						
						
						
						
					 
					
						2011-07-27 21:11:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							b240c4a645 
							
						 
					 
					
						
						
							
							WIP: make creating an ELB bullet proof  
						
						 
						
						
						
						
					 
					
						2011-07-27 21:11:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							0ee45261e7 
							
						 
					 
					
						
						
							
							set a flag so that api clients know whether to use the elb api  
						
						 
						
						
						
						
					 
					
						2011-07-27 16:00:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							042c06fbb6 
							
						 
					 
					
						
						
							
							Make createLoadBalancer async  
						
						 
						
						
						
						
					 
					
						2011-07-27 12:00:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							cd8e069f80 
							
						 
					 
					
						
						
							
							Acquire an ip and launch an ELB vm  
						
						 
						
						
						
						
					 
					
						2011-07-27 12:00:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							3c66075b8b 
							
						 
					 
					
						
						
							
							bug 10557: made more feature enhancement instead of bug- added more stats parametes as global config  
						
						 
						
						
						
						
					 
					
						2011-07-27 14:06:26 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							93680fdc9e 
							
						 
					 
					
						
						
							
							Bug:10557  
						
						 
						
						
						
						
					 
					
						2011-07-27 14:05:47 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							f0b1f3d229 
							
						 
					 
					
						
						
							
							bug 10557: made more feature enhancement instead of bug- added more stats parametes as global config  
						
						 
						
						
						
						
					 
					
						2011-07-27 13:42:14 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							b7f5dbe2b8 
							
						 
					 
					
						
						
							
							Bug 9887 - baremetal: support for image operation (create template from guest disk) (edit)  
						
						 
						
						... 
						
						
						
						Use createTemplate API instead a new one 
						
						
					 
					
						2011-07-26 18:07:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							95535f9266 
							
						 
					 
					
						
						
							
							Bug 9887 - baremetal: support for image operation (create template from guest disk) (edit)  
						
						 
						
						... 
						
						
						
						Use createTemplate API instead a new one 
						
						
					 
					
						2011-07-26 18:05:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							96bacb85f8 
							
						 
					 
					
						
						
							
							Bug:10557  
						
						 
						
						
						
						
					 
					
						2011-07-25 17:40:33 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							6d85c9952c 
							
						 
					 
					
						
						
							
							bug 9452: Remove the overridden getPageSizeVal function in listCapacity and use it from BaseListCmd which has the changes for default pagination to unlimited.  
						
						 
						
						
						
						
					 
					
						2011-07-22 13:12:35 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							e666cf5e77 
							
						 
					 
					
						
						
							
							bug 10743: default local storage is ext in XenServer 6.0, add ext local storage support  
						
						 
						
						
						
						
					 
					
						2011-07-21 17:31:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keshav 
							
						 
					 
					
						
						
						
						
							
						
						
							4ce137ef2e 
							
						 
					 
					
						
						
							
							Added account ID to IpAddressTO and NetworkElementCommand.  
						
						 
						
						
						
						
					 
					
						2011-07-21 16:44:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							d6112b1632 
							
						 
					 
					
						
						
							
							Revert "bug 10373: Intermediate checkin for Domain level guest Virtual networks"  
						
						 
						
						... 
						
						
						
						This reverts commit e5c25f3868965e36c4bff1c78ca4552a8c852241.
Conflicts:
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/network/NetworkManagerImpl.java 
						
						
					 
					
						2011-07-21 16:04:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							abd3321077 
							
						 
					 
					
						
						
							
							bug 10799: propagate to 2.2.9  
						
						 
						
						
						
						
					 
					
						2011-07-21 11:30:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f82aa97273 
							
						 
					 
					
						
						
							
							bug 10799: propagate to main  
						
						 
						
						
						
						
					 
					
						2011-07-21 11:27:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							45074e7cba 
							
						 
					 
					
						
						
							
							bug 10799: There are two problems.  The deadlock was ate up but then the savepublicip call return true, causing the problem with the pod_vlan_map hitting a constraint problem.  HostPodDao was used as the scope for the insufficient capacity exception which causes the virtualmachinemanager to not to retry starting the vm.  It should have been HostPod instead of HostPodDao.  
						
						 
						
						
						
						
					 
					
						2011-07-21 11:22:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							dff712f2a9 
							
						 
					 
					
						
						
							
							bug 10731: sending source cidrs to the required router element, on domR allowing these source cidrs thru iptables  
						
						 
						
						... 
						
						
						
						status 10731: resolved fixed 
						
						
					 
					
						2011-07-21 13:48:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							de34d6089d 
							
						 
					 
					
						
						
							
							bug 10731: sending source cidrs to the required router element, on domR allowing these source cidrs thru iptables  
						
						 
						
						... 
						
						
						
						status 10731: resolved fixed 
						
						
					 
					
						2011-07-21 13:40:06 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							36edf298e7 
							
						 
					 
					
						
						
							
							bug 10373: Intermediate checkin for Domain level guest Virtual networks  
						
						 
						
						
						
						
					 
					
						2011-07-20 13:44:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							427b73a2b9 
							
						 
					 
					
						
						
							
							bug 10372: Added Vm State Machine listener for usage events  
						
						 
						
						... 
						
						
						
						status 10372: resolved fixed 
						
						
					 
					
						2011-07-20 11:13:56 +05:30