Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							092e20204a 
							
						 
					 
					
						
						
							
							Divided NetworkManagerImpl into two files: NetworkManagerImpl and IpAddressManagerImpl  
						
						
						
						
					 
					
						2013-08-19 14:13:29 -07:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							9de7e0af18 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4386  
						
						... 
						
						
						
						XS Creating templates from volume - send the physical size in the copycommand which accordingly will populate template store ref and the usage_event tables with the right physical size
Signed off by : nitin mehta<nitin.mehta@citrix.com> 
						
						
					 
					
						2013-08-19 16:04:12 +05:30 
						 
				 
			
				
					
						
							
							
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							41f2c75aee 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4385 : [ZWPS]Across the cluster live migration of VM on zone wide primary storage pool fails  
						
						... 
						
						
						
						If all the VM's volumes are on zone wide primary storage pool then live migration of the VM would not involve storage migration. Hence MigrateVM API would be called against MigrateVMWithVolume. So far PrepareForMigrationCommand handled scenarios of VM moving across hosts within a cluster, but with zone wide primary storage in picture this command need to handle scenarios of VM moving across clusters. Try to find the VM in datacenter if not found within cluster.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2013-08-19 05:55:17 +05:30 
						 
				 
			
				
					
						
							
							
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							35b5df61c0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4384: Switch back to CLOUD_DB after simulator processing  
						
						... 
						
						
						
						Simulator should revert back to CLOUD_DB after its operations on
SIMULATOR_DB or the cloudstack connections go to the simulator instead
of cloud.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 3d39716c8fed2b27edbd4475a7e0915b1200123c) 
						
						
					 
					
						2013-08-19 10:40:55 +05:30 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							8a104b95d5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2583: [Object_Store_Refactor] Failed to create snapshot from  
						
						... 
						
						
						
						root disk of a guest VM. 
						
						
					 
					
						2013-08-14 18:02:25 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							90388ce77e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4315: add code to clean up libvirt data structure after plug/unplug, that's the only thing I can do to fix this kind of libvirt issue  
						
						
						
						
					 
					
						2013-08-14 16:59:07 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							dd6b245221 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4318: clean up snapshot stored in staging area, after backup snapshot to object store  
						
						
						
						
					 
					
						2013-08-14 14:59:25 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							374de76dae 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4324: need to clean up snapshot_store_ref, if creating snapshot failed.  
						
						
						
						
					 
					
						2013-08-14 14:59:19 -07:00 
						 
				 
			
				
					
						
							
							
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							3c35faaf5a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4278: Fix resizing RBD volumes  
						
						... 
						
						
						
						Although libvirt supports resizing RBD volumes (and other formats) the
Java bindings (libvirt-java) don't.
Right now we use the Java bindings for librbd to handle the resizing for us,
but in the future this should be done by libvirt rather then these
Java bindings. 
						
						
					 
					
						2013-08-14 16:15:09 +02:00 
						 
				 
			
				
					
						
							
							
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							b0e06981c1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4326 Adding VMware DC to legacy zone should not be allowed by API  
						
						... 
						
						
						
						Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2013-08-14 12:47:58 +05:30 
						 
				 
			
				
					
						
							
							
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							d7f738fb64 
							
						 
					 
					
						
						
							
							rbd: When the template is a RAW image, do not use a temp file when deploying  
						
						
						
						
					 
					
						2013-08-14 13:28:08 +02:00 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							c3bc9d65dd 
							
						 
					 
					
						
						
							
							Remove unused method deleteVbdByPath from KVM storage classes  
						
						
						
						
					 
					
						2013-08-13 23:51:05 +02:00 
						 
				 
			
				
					
						
							
							
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							04f378bcff 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4114: Use RAW disk images for RBD instead of QCOW2  
						
						
						
						
					 
					
						2013-08-13 16:14:45 +02:00 
						 
				 
			
				
					
						
							
							
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							9cc74429bd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4285: configure simulator API not discovered  
						
						... 
						
						
						
						- ManagementServerSimulatorImpl is not injected by default context.
configureSimulatorCmd API was loaded as part of it. Use
SimulatorManagerImpl as PluggableService to inject configureSimulator
API.
- Remove unused ManagementServerSimulatorImpl.
- Rename ConfigureSimulator to ConfigureSimulatorCmd for uniformity with
  all API Cmds
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 0c294a50a8a926580ca724dee137488ea6242bf7) 
						
						
					 
					
						2013-08-13 18:04:08 +05:30 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							d57796b94f 
							
						 
					 
					
						
						
							
							Fix XML validation errors  
						
						
						
						
					 
					
						2013-08-13 08:25:45 +02:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							de2bd96d98 
							
						 
					 
					
						
						
							
							Moved volume related code into cloud-engine-orchestration  
						
						
						
						
					 
					
						2013-08-12 19:06:51 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							1a6b7d6714 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4216: fix extract volume for kvm  
						
						
						
						
					 
					
						2013-08-12 17:20:15 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							9a89fd94fc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4211: fix s3 on kvm  
						
						
						
						
					 
					
						2013-08-12 17:20:09 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							8af05e5202 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4253: add more logs for vmware storage related operations  
						
						
						
						
					 
					
						2013-08-12 17:19:17 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							3ad9681fd1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4253: change the log message if copy template from secondary storage to primary storage failed  
						
						
						
						
					 
					
						2013-08-12 17:19:04 -07:00 
						 
				 
			
				
					
						
							
							
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							9e3aa37a8d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3905 [VMWARE]Can not add Standard/DVSwitch when Nexus global config is set to true  
						
						... 
						
						
						
						Make VSM specific input paramters optional while adding VMware cluster where no traffic chosen to use Nexus 1000v dvSwitch when cloud level vSwitch is Nexus 1000v.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2013-08-12 22:45:01 +05:30 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2056524411 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4224  
						
						... 
						
						
						
						UCS:UI: Delete UCS returns unknown API
Conflicts:
	plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java 
						
						
					 
					
						2013-08-12 12:10:35 -07:00 
						 
				 
			
				
					
						
							
							
								JijunLiu 
							
						 
					 
					
						
						
						
						
							
						
						
							8d53887cec 
							
						 
					 
					
						
						
							
							add doc for kvm cpu model  
						
						... 
						
						
						
						Signed-off-by: Wei Zhou <w.zhou@leaseweb.com> 
						
						
					 
					
						2013-08-12 15:19:25 +02:00 
						 
				 
			
				
					
						
							
							
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							f0ae682d48 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4246 VM deployment fails with global configuration parameter "vmware.nested.virtualization" enabled.  
						
						... 
						
						
						
						Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2013-08-12 09:44:33 +05:30 
						 
				 
			
				
					
						
							
							
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							14abe4cb2d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4155 [VMWARE] Failed to deploy VM with NPE when vmware.nested.virtualization is enabled to true  
						
						... 
						
						
						
						Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2013-08-12 07:43:10 +05:30 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							726114a95d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3850: CPU cap should be per VM not per VCPU  
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2013-08-12 08:59:18 +05:30 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							798d8f1e4b 
							
						 
					 
					
						
						
							
							cloudstack-4235  
						
						
						
						
					 
					
						2013-08-10 17:37:43 -06:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							4333209af3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3495  
						
						... 
						
						
						
						CS used to access vnc server in xenserver dom0 to get VM console, now CS moves to use XenServer console API. getvncport plugin is not needed any more.
        remove the code related to getvncport in XenServer 
						
						
					 
					
						2013-08-09 17:22:54 -07:00 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							d95e3dacd6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2448: XenServer Guest OS Mapping Corrections.  
						
						
						
						
					 
					
						2013-08-09 18:49:02 +05:30 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							d6ebcd1924 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4187: 2.2.1 - 4.2 Upgrade: Few Guest OS Types information is inconsistent on the Upgraded Setup when compared with the fresh 4.2 Installation.  
						
						
						
						
					 
					
						2013-08-09 15:27:56 +05:30 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							6d86af85ba 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2729: increase waiting timeout for global file lock to 300 seconds  
						
						
						
						
					 
					
						2013-08-09 08:58:46 +02:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							ec2eafdfde 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3538: if passcmdline succeed, don't need to retry again, and increase the retry to 5 minutes at most  
						
						
						
						
					 
					
						2013-08-08 17:21:38 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							bf6961255a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4190:[Object_store_refactor] volume should be deleted from  
						
						... 
						
						
						
						staging storage after successfule volume migration . 
						
						
					 
					
						2013-08-08 16:16:36 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5495f10bce 
							
						 
					 
					
						
						
							
							Revert "Reverting the range of commits that broke the build"  
						
						... 
						
						
						
						This reverts commit b59e3aaefced03d40d5b4b63c421c69743bcd387. 
						
						
					 
					
						2013-08-08 15:02:40 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							d38ed20568 
							
						 
					 
					
						
						
							
							CloudStack CLOUDSTACK-4160  
						
						... 
						
						
						
						listUcsManagers API needs to be able to take in id parameter 
						
						
					 
					
						2013-08-08 15:02:13 -07:00 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							b2ed632396 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2729: use spd.getTargetPath instead of mount path to fix issue on local storage  
						
						
						
						
					 
					
						2013-08-08 16:38:07 +02:00 
						 
				 
			
				
					
						
							
							
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							f43f3bb95e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2558 Nexus configuration cleanup is not done when there is a failure while adding the Nexus enabled VMWARE cluster which is causing for NPE while readding the cluster with same configuration details  
						
						... 
						
						
						
						If cluster addition fails then cleaning up the Nexus VSM related to the cluster.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2013-08-08 13:49:11 +05:30 
						 
				 
			
				
					
						
							
							
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							b59e3aaefc 
							
						 
					 
					
						
						
							
							Reverting the range of commits that broke the build  
						
						... 
						
						
						
						This reverts commits 30c33415..f6a2c817bc
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-08-08 14:46:56 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							9bce985f62 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4108: fix create template from snapshot for vmware& s3  
						
						
						
						
					 
					
						2013-08-07 19:14:22 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							e851f4a930 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4109: fix upload volume to s3 for vmware  
						
						
						
						
					 
					
						2013-08-07 19:14:18 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							82c35e52ea 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4135:  [Object_store_refactor] ISO attached to the guest vm  
						
						... 
						
						
						
						has wrong mount path. 
						
						
					 
					
						2013-08-07 18:01:58 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5287f4c9ec 
							
						 
					 
					
						
						
							
							Got everything running through testing  
						
						
						
						
					 
					
						2013-08-07 16:41:06 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							942f282a6e 
							
						 
					 
					
						
						
							
							Moved config into it's own package  
						
						
						
						
					 
					
						2013-08-07 16:41:02 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							e115ee4026 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3535: still maintain stop agent wont trigger HA  
						
						
						
						
					 
					
						2013-08-07 14:43:16 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							7cbd66f71c 
							
						 
					 
					
						
						
							
							CloudStack CLOUDSTACK-4160  
						
						... 
						
						
						
						listUcsManagers API needs to be able to take in id parameter 
						
						
					 
					
						2013-08-07 14:45:50 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							5b0314fff9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3535: add kvminvestigator to investirage kvm host  
						
						... 
						
						
						
						Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java 
						
						
					 
					
						2013-08-07 11:44:19 -07:00 
						 
				 
			
				
					
						
							
							
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							a470b33f97 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3616 [VMware] Failed to create template from volume (volume is created from snapshot of data volume)  
						
						... 
						
						
						
						Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2013-08-07 14:56:08 +05:30 
						 
				 
			
				
					
						
							
							
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							1d9465d758 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3782 Data disk size is modified to KB from GB after it is attached to the instance  
						
						... 
						
						
						
						Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2013-08-07 08:08:46 +05:30 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							0b00e13e24 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3723: System VM Template for XenServer has wrong guest OS type Information on the Database  
						
						... 
						
						
						
						Also added the debian 7 to debian 6 mapping in CitrixHelper file
to support the debian 7 template in XS 6.0, 6.0.2, 6,1 etc. 
						
						
					 
					
						2013-08-07 12:57:11 +05:30 
						 
				 
			
				
					
						
							
							
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							3946070359 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4041 [ZWPSFailed to migrate a ROOT volume created on zone wide primary storage  
						
						... 
						
						
						
						While finding endpoint to send the migrate volume command, in case of zone wide storage pool, storage engine is picking a host among all connected hosts randomly. Hence a host may be from different cluster t
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2013-08-07 06:07:54 +05:30