Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							51af0db682 
							
						 
					 
					
						
						
							
							mass merge 2.2.10  
						
						 
						
						
						
						
					 
					
						2011-08-11 16:41:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keshav 
							
						 
					 
					
						
						
						
						
							
						
						
							df5f48c093 
							
						 
					 
					
						
						
							
							Added parameter to enable the firewall rule UI to the list capabilities API.  
						
						 
						
						
						
						
					 
					
						2011-08-11 12:03:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keshav 
							
						 
					 
					
						
						
						
						
							
						
						
							d47eb46faf 
							
						 
					 
					
						
						
							
							Added parameter to enable the firewall rule UI to the list capabilities API.  
						
						 
						
						
						
						
					 
					
						2011-08-11 11:42:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							1079a77024 
							
						 
					 
					
						
						
							
							bug 11043: rverted the bad fix  
						
						 
						
						
						
						
					 
					
						2011-08-11 10:27:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							15f86d3d93 
							
						 
					 
					
						
						
							
							bug 11043: rverted the bad fix  
						
						 
						
						
						
						
					 
					
						2011-08-11 10:25:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							278f2a401f 
							
						 
					 
					
						
						
							
							bug 10561: intermediate checkin for enable/disableStaticNat.  
						
						 
						
						... 
						
						
						
						1) On enableStaticNat command we actually send the command to the backend (we used to just upgrade the DB in the past). The backend command carries sourceIp and destIp, and creates IP to IP mapping on the domR.
2) On disableStaticNat for the Ip address in addition to cleaning up port ranges, we also delete IP to IP mapping on the domR. 
						
						
					 
					
						2011-08-11 10:19:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							7c2395e684 
							
						 
					 
					
						
						
							
							bug 10561: fix: last entry in the firewall rules unable to delete  
						
						 
						
						
						
						
					 
					
						2011-08-11 19:01:36 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							375da4da1a 
							
						 
					 
					
						
						
							
							bug 11072: icky icky icky  
						
						 
						
						
						
						
					 
					
						2011-08-10 20:40:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							d29b01ca7f 
							
						 
					 
					
						
						
							
							bug 10561: backend rules for firewall  
						
						 
						
						
						
						
					 
					
						2011-08-10 18:39:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							dc116d99a8 
							
						 
					 
					
						
						
							
							Get ipAddress info not from the rule, but from the request parameter ipAddressId  
						
						 
						
						
						
						
					 
					
						2011-08-10 16:47:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							e1de9f5bec 
							
						 
					 
					
						
						
							
							bug 11021: Add ReservationStrategy.Managed to prevent sourceNat from release  
						
						 
						
						... 
						
						
						
						status 11021: resolved fixed 
						
						
					 
					
						2011-08-10 12:52:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							58a13c0d5a 
							
						 
					 
					
						
						
							
							bug 11021: Add ReservationStrategy.Managed to prevent sourceNat from release  
						
						 
						
						... 
						
						
						
						status 11021: resolved fixed 
						
						
					 
					
						2011-08-10 12:51:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							32b53351ff 
							
						 
					 
					
						
						
							
							Fixed response processing in createFirewallRule command  
						
						 
						
						
						
						
					 
					
						2011-08-10 11:36:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							a9eb14c42e 
							
						 
					 
					
						
						
							
							bug 10561: backend added for CreateFirewallRule and deleteFirewallRule  
						
						 
						
						
						
						
					 
					
						2011-08-10 17:06:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							949ad3f4c4 
							
						 
					 
					
						
						
							
							bug 10561: readding source cidr changes to firewall rules  
						
						 
						
						
						
						
					 
					
						2011-08-10 13:55:37 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							9bba09857e 
							
						 
					 
					
						
						
							
							bug 10561: readding source cidr changes to firewall rules  
						
						 
						
						
						
						
					 
					
						2011-08-10 13:52:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							e4967c4631 
							
						 
					 
					
						
						
							
							Fixed typos in api doc for listFirewalls command  
						
						 
						
						
						
						
					 
					
						2011-08-09 09:58:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							779ca9ac1a 
							
						 
					 
					
						
						
							
							fix associate ip exception  
						
						 
						
						
						
						
					 
					
						2011-08-09 09:53:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							311afeae23 
							
						 
					 
					
						
						
							
							bug 10731: reverting back source cidr changes for loadbalancer and portforwarding  
						
						 
						
						
						
						
					 
					
						2011-08-09 16:01:48 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							301bf049d1 
							
						 
					 
					
						
						
							
							fix compile issues  
						
						 
						
						
						
						
					 
					
						2011-08-08 22:03:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							924961d898 
							
						 
					 
					
						
						
							
							merge nectarine  
						
						 
						
						
						
						
					 
					
						2011-08-08 21:45:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							06d007337a 
							
						 
					 
					
						
						
							
							bug 10561: intermidiate checkin for FirewallRuleFeature  
						
						 
						
						... 
						
						
						
						1) Added new apis: createFirewallRule, deleteFirewallRule, listFirewallRules
2) Modified existing apis - added boolean openFirewall parameter to createPortForwardingRule/createIpForwardingRule/createRemoteAccessVpn. If parameter is set to true, open firewall on the domR before creating an actual PF rule there
Modified backend calls appropriately.
3) Schema changes for firewall_rules table:
* startPort/endPort can be null now
* added icmp_type, icmp_code fields (can be not null only when protocol is icmp)
4) Added new manager - FirewallManagerImpl 
						
						
					 
					
						2011-08-08 20:59:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							39a3d82f11 
							
						 
					 
					
						
						
							
							Add prepareTemplate command(admin only) to allow pre-loading template into primary storage  
						
						 
						
						
						
						
					 
					
						2011-08-08 18:37:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							8277584b8a 
							
						 
					 
					
						
						
							
							merge ELB / nectarine branch  
						
						 
						
						
						
						
					 
					
						2011-08-08 15:20:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							19567df49b 
							
						 
					 
					
						
						
							
							bug 10765: fix step 2 - programming VNC server to let it chose the right keyboard mapping to load into  
						
						 
						
						
						
						
					 
					
						2011-08-04 18:27:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							2b35974f9b 
							
						 
					 
					
						
						
							
							Fixed doc bug in createVolume api  
						
						 
						
						
						
						
					 
					
						2011-08-04 15:48:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							0826066f7f 
							
						 
					 
					
						
						
							
							bug 10757: override default page size only in listCfg api command  
						
						 
						
						... 
						
						
						
						status 10757: resolved fixed 
						
						
					 
					
						2011-08-04 12:56:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							f1d3e73d08 
							
						 
					 
					
						
						
							
							Fix KVM agent connection issue, and build  
						
						 
						
						... 
						
						
						
						non-static inner class can't be serialized, also it lacks no-args
constructor. 
						
						
					 
					
						2011-08-04 11:56:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							9ae546e67b 
							
						 
					 
					
						
						
							
							Revert "Fix KVM agent connection issue"  
						
						 
						
						... 
						
						
						
						This reverts commit 4a3296bd5e489997c2c5ffb2368f688c3a1b9498. 
						
						
					 
					
						2011-08-04 11:43:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							75fc541754 
							
						 
					 
					
						
						
							
							Fix KVM agent connection issue  
						
						 
						
						... 
						
						
						
						non-static inner class can't be serialized, also it lacks no-args constructor. 
						
						
					 
					
						2011-08-04 11:35:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							cd78c5cb9b 
							
						 
					 
					
						
						
							
							bug 10812: putting key in ZoneConfig and other nomenclature changes  
						
						 
						
						
						
						
					 
					
						2011-08-03 14:32:28 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							6dd519ddd4 
							
						 
					 
					
						
						
							
							bug 10812: putting key in ZoneConfig and other nomenclature changes  
						
						 
						
						
						
						
					 
					
						2011-08-03 14:16:08 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							46be774ce8 
							
						 
					 
					
						
						
							
							bug 10812: adding domain suffixes to zone's router conf  
						
						 
						
						
						
						
					 
					
						2011-08-02 11:08:24 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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