Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							aa84256542 
							
						 
					 
					
						
						
							
							1) Added VpcVirtualNetworkApplianceService interface  
						
						... 
						
						
						
						2) Pass dns1/dns2 to setupGuestNetworkCommand
3) Network implement - don't get source nat ip address for Vpc if it already has one 
						
						
					 
					
						2012-06-15 14:27:00 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d70d2f82d4 
							
						 
					 
					
						
						
							
							StartRouter: set only control nic during the initial router start; plug exising public and guest nics after the router is started with control nic  
						
						
						
						
					 
					
						2012-06-15 14:25:31 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							31b8f07bb5 
							
						 
					 
					
						
						
							
							Added NicTO to setupGuestNetworkCommand constructor - we need this info for guest network configuraiton  
						
						
						
						
					 
					
						2012-06-15 14:22:40 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							0a7faa9838 
							
						 
					 
					
						
						
							
							Support for adding private network  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java 
						
						
					 
					
						2012-06-15 14:20:34 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							f28cefc4c3 
							
						 
					 
					
						
						
							
							Added support for network shutdown in VPC guest networks  
						
						
						
						
					 
					
						2012-06-15 14:07:59 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d9fd7e02a5 
							
						 
					 
					
						
						
							
							Plug nic support  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java 
						
						
					 
					
						2012-06-15 14:07:46 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d11dceaccc 
							
						 
					 
					
						
						
							
							CS-14904  
						
						... 
						
						
						
						Fixed the bug where vm_instance.ha_enabled wasn't updated during service offering upgrade
Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java 
						
						
					 
					
						2012-05-15 12:36:40 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5021274232 
							
						 
					 
					
						
						
							
							CS-14256: throw executionException when finalizeStart fails (no point to retry).  
						
						
						
						
					 
					
						2012-04-23 15:56:23 -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 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							9b089f2eb7 
							
						 
					 
					
						
						
							
							AdvanceStart: do cleanup() call with force=true when the start command wasn't sent to the backend yet  
						
						
						
						
					 
					
						2012-04-13 17:19:02 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2d1a6b0b35 
							
						 
					 
					
						
						
							
							bug 14615: deployVm can work 2 diff ways now: 1) Default way - create and start the vm. 2) Create the vm without starting it. Note that vm's volumes stay in Allocated state -not created on the backend till the point where vm starts  
						
						... 
						
						
						
						status 14615: resolved fixed 
						
						
					 
					
						2012-04-06 11:30:48 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2f634c0913 
							
						 
					 
					
						
						
							
							Switch to Apache license  
						
						
						
						
					 
					
						2012-04-03 04:50:05 -07:00 
						 
				 
			
				
					
						
							
							
								Abhi 
							
						 
					 
					
						
						
						
						
							
						
						
							d3673506cf 
							
						 
					 
					
						
						
							
							bug 14216: rightly initializing to avoid NPE  
						
						
						
						
					 
					
						2012-03-21 15:33:05 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c052d96428 
							
						 
					 
					
						
						
							
							bug 13966: cleanup the vm (stop it on the backend) when work step is Release. Also never retry when finalizeStart failed  
						
						... 
						
						
						
						status 13966: resolved fixed
reviewed-by: Alex Huang 
						
						
					 
					
						2012-02-23 15:13:47 -08:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							f619e26c48 
							
						 
					 
					
						
						
							
							Bug 13850 - VM stuck in starting state if it is started during the HA-Work of the corresponding router  
						
						... 
						
						
						
						Reviewed-By: Kelven
Changes:
- Update the pending work Item to be DONE if we are changing the VM state during fullSync. 
						
						
					 
					
						2012-02-22 17:36:00 -08:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							e37732c4de 
							
						 
					 
					
						
						
							
							Bug 13766 - VMs are still running after disabling the zone  
						
						... 
						
						
						
						Reviewed-by: Sheng Yang
Changes:
- Do not check if allocation_state is 'Enabled' in planner if the caller is Root Admin.
- This should let Root Admin create a VM in a disabled Zone. 
						
						
					 
					
						2012-02-22 17:34:00 -08:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							eb43f780f7 
							
						 
					 
					
						
						
							
							Bug 13824 - VM deployment fails due to volume not being recreatable  
						
						... 
						
						
						
						Reviewed-By: Alex
Changes:
- Reuse the same storagepool where the Volume is ready on each retry of VM deployment until the cluster where the volume is has capacity
- After the cluster is out of capacity, we look in other clusters and find a new storagepool.
- At this point if the volume is recreatable on the new storagepool, depoyment will succeed provided everytyhing else goes through
- But if the volume is not recreatable and its cluster is out of capacity, we will still fail to deploy the VM 
						
						
					 
					
						2012-02-16 17:04:25 -08:00 
						 
				 
			
				
					
						
							
							
								abhi 
							
						 
					 
					
						
						
						
						
							
						
						
							fac8091c9f 
							
						 
					 
					
						
						
							
							bug 13673: stopping alien VMs during sync for Xenserver  
						
						
						
						
					 
					
						2012-02-16 12:35:36 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							8f869b6a18 
							
						 
					 
					
						
						
							
							Bug 13591: Remove unwarranted log messages that we are printing with every answer recieved from the agent.  
						
						... 
						
						
						
						Reviewed-By: Kishan 
						
						
					 
					
						2012-02-13 16:33:52 +05:30 
						 
				 
			
				
					
						
							
							
								abhi 
							
						 
					 
					
						
						
						
						
							
						
						
							20968a408c 
							
						 
					 
					
						
						
							
							bug 13549: cleanup stopped/starting VMs if present on host during MS startup  
						
						... 
						
						
						
						reveiewed-by: kishan 
						
						
					 
					
						2012-02-13 07:25:01 +05:30 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							278833eb29 
							
						 
					 
					
						
						
							
							Bug 13420: Send alert of type 18 when sending alert for SSVM  
						
						... 
						
						
						
						Status 13420: resolved fixed
Reviewed-By: Nitin 
						
						
					 
					
						2012-02-08 18:50:42 +05:30 
						 
				 
			
				
					
						
							
							
								abhi 
							
						 
					 
					
						
						
						
						
							
						
						
							59c7150af7 
							
						 
					 
					
						
						
							
							bug 13439: full sync at management server restart, disabling hourly sync  
						
						
						
						
					 
					
						2012-02-06 15:01:44 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d4d345a587 
							
						 
					 
					
						
						
							
							Don't retry to re-create the vm when failed to allocate public ip  
						
						
						
						
					 
					
						2012-01-19 14:00:07 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d5752eca61 
							
						 
					 
					
						
						
							
							Error deployVm when elasticIp/staticNat failed to assign to the vm  
						
						
						
						
					 
					
						2012-01-19 13:58:34 -08:00 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							a60d8cea86 
							
						 
					 
					
						
						
							
							bug 12530: moved the initial full sunc from the cron to host connect.  
						
						
						
						
					 
					
						2012-01-02 13:40:33 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							9333acffb4 
							
						 
					 
					
						
						
							
							bug 12530: ignore VMs in starting state, as the first sync may happen after the managment server has already issued start for system VMs  
						
						
						
						
					 
					
						2011-12-30 10:35:08 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							5e4acc2a55 
							
						 
					 
					
						
						
							
							bug 12530: introduce initial full sync; cleanup syncronization;  
						
						
						
						
					 
					
						2011-12-27 11:13:38 +05:30 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							8ef2724c26 
							
						 
					 
					
						
						
							
							better log when deploy vm failed  
						
						
						
						
					 
					
						2011-12-19 15:50:11 -08:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							5102279824 
							
						 
					 
					
						
						
							
							bug 12586: Remove the duplicate sync code of fullHostSync()  
						
						... 
						
						
						
						fullHostSync() is messed up.
The sync operation have been done twice, and for the second time, the original
info has already cleared, so default value "Stopped" is created, then result in
stop all the vms.
The fullHostSync() is skipped for Xen, so Xen don't have this issue.
status 12586: resolved fixed 
						
						
					 
					
						2011-12-15 14:47:48 -08:00 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							a703315d34 
							
						 
					 
					
						
						
							
							bug 12348: fixed getting VMs for a cluster which was not getting back VMs in starting state  
						
						
						
						
					 
					
						2011-12-13 12:20:48 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							0980c47100 
							
						 
					 
					
						
						
							
							bug 12363: don't expunge nics when vm is expunged, just leave them in Removed state in the DB  
						
						... 
						
						
						
						status 12363: resolved fixed 
						
						
					 
					
						2011-12-09 14:26:30 -08:00 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							a560d6f055 
							
						 
					 
					
						
						
							
							bug 11910: no need to do full sync as first thing after connect  
						
						
						
						
					 
					
						2011-11-29 11:23:21 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							586febd4c1 
							
						 
					 
					
						
						
							
							bug 11965: check the user state on the Services layer, not in the VmManager as VmManager can be called not only from the API, but also by internal methods - HA for instance - and in this case we shouldn't care about the account state  
						
						... 
						
						
						
						11965 status: resolved fixed
Also fixed gson serialization error in account response 
						
						
					 
					
						2011-11-28 10:05:19 -08:00 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							da20d33e27 
							
						 
					 
					
						
						
							
							bug 11910: full sync will only stop unknown VMs on agent  
						
						
						
						
					 
					
						2011-11-23 16:48:12 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							84d5f0514e 
							
						 
					 
					
						
						
							
							Changed network tags to network name as we no longer need to send the entire network tags down to the resource.  
						
						
						
						
					 
					
						2011-11-18 14:28:16 -08:00 
						 
				 
			
				
					
						
							
							
								Abhi 
							
						 
					 
					
						
						
						
						
							
						
						
							9086a39bda 
							
						 
					 
					
						
						
							
							bug 11910: avoid Starting to Running state changes during full sync, as the VM startup process does not like it  
						
						
						
						
					 
					
						2011-11-17 14:32:56 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							b793ce6c33 
							
						 
					 
					
						
						
							
							bug 11987: changing virtualmachineimpl to reoccuring listener  
						
						... 
						
						
						
						reviewed-by: nitin 
						
						
					 
					
						2011-11-11 19:24:09 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							d6c22c42fe 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						
						
						
					 
					
						2011-11-10 15:26:39 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f6fcaa49ec 
							
						 
					 
					
						
						
							
							Merge complete except for virtualnetworkappliancemanager  
						
						
						
						
					 
					
						2011-11-10 15:18:16 -08:00 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							a2499c9e69 
							
						 
					 
					
						
						
							
							bug 11910: during full sync ignoring VMs which have been into starting state shortly  
						
						... 
						
						
						
						reviewed-by: kishan 
						
						
					 
					
						2011-11-10 12:00:10 +05:30 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							fab2d1f880 
							
						 
					 
					
						
						
							
							bug 11678: added vm.destory.forcestop config var to set force when destroying a vm  
						
						
						
						
					 
					
						2011-11-03 15:51:02 +05:30 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							2250dff349 
							
						 
					 
					
						
						
							
							1) Removed tags from the network object  
						
						... 
						
						
						
						2) Get hypervisor tags from the physical network instead. 
						
						
					 
					
						2011-11-01 17:42:06 -07:00 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							3cb1426a6c 
							
						 
					 
					
						
						
							
							bug 10588: sending cluster sync only for xen  
						
						
						
						
					 
					
						2011-10-28 11:39:22 +05:30 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							fe0b685e95 
							
						 
					 
					
						
						
							
							Security group is a service now  
						
						
						
						
					 
					
						2011-10-27 16:49:20 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							21de281276 
							
						 
					 
					
						
						
							
							Fix broken compilation by new anget manager merge  
						
						
						
						
					 
					
						2011-10-27 11:24:10 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							cef30956e9 
							
						 
					 
					
						
						
							
							Merge branch 'newagentmgr'  
						
						... 
						
						
						
						Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java 
						
						
					 
					
						2011-10-27 11:09:56 -07:00 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							a1a0fdc0a3 
							
						 
					 
					
						
						
							
							bug 10588: making sure the vms are synced during a delta also  
						
						
						
						
					 
					
						2011-10-27 15:56:53 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							193474a595 
							
						 
					 
					
						
						
							
							Storage migration: if it's basic network and migrate to different pod, need to reallocate network  
						
						
						
						
					 
					
						2011-10-25 19:20:18 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							92eaf49f29 
							
						 
					 
					
						
						
							
							Add storage migration  
						
						
						
						
					 
					
						2011-10-24 15:59:47 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							219978a9be 
							
						 
					 
					
						
						
							
							Create network using physical network id  
						
						
						
						
					 
					
						2011-10-20 18:25:13 -07:00