Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							1d2124dcbf 
							
						 
					 
					
						
						
							
							Fix NPE reported on IRC, provide the user an informative error message  
						
						 
						
						
						
						
					 
					
						2014-07-22 17:45:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							4523490d44 
							
						 
					 
					
						
						
							
							Fixed Coverity Issues reported  
						
						 
						
						... 
						
						
						
						Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com> 
						
						
					 
					
						2014-07-22 18:03:36 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							7d3f381d94 
							
						 
					 
					
						
						
							
							Set mapped device path while detaching rbd disk  
						
						 
						
						
						
						
					 
					
						2014-07-22 17:50:58 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							b3e4c6d6dc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7150. [VMware] Global config 'vm.instancename' is not honored.  
						
						 
						
						... 
						
						
						
						If global config 'vm.instancename' is set to true, VM name in vCenter should be '<instance_name>-<vm_hostname>'. 
						
						
					 
					
						2014-07-22 11:59:53 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Suresh Ramamurthy 
							
						 
					 
					
						
						
						
						
							
						
						
							03de9cc335 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6845 : NuageVsp Network plugin  
						
						 
						
						... 
						
						
						
						Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2014-07-21 10:49:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							d05549e16b 
							
						 
					 
					
						
						
							
							XS task object may disappear, change the log level  
						
						 
						
						
						
						
					 
					
						2014-07-18 16:05:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							849049a2f0 
							
						 
					 
					
						
						
							
							KVM: Allow changing VM video card via agent.properties. This change in  
						
						 
						
						... 
						
						
						
						LibvirtVMDef can also be leveraged to add the option to service offering
or template hardware selection (as nic and disk types do). 
						
						
					 
					
						2014-07-18 16:52:51 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							9fb93fe5b3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7110: introduced by c1116142a3cd356e1e8da5404be150a07752b5d5, if it's a data volume, mgt server doesn't send image format to agent  
						
						 
						
						
						
						
					 
					
						2014-07-18 12:03:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							c1aed55583 
							
						 
					 
					
						
						
							
							More rat fixes  
						
						 
						
						
						
						
					 
					
						2014-07-18 11:52:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							5651a13cfd 
							
						 
					 
					
						
						
							
							Remove duplicated code  
						
						 
						
						
						
						
					 
					
						2014-07-18 09:28:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Joris van Lieshout 
							
						 
					 
					
						
						
						
						
							
						
						
							e8c32c7f5b 
							
						 
					 
					
						
						
							
							Disable inband management of openvswitch on the link local network. You don't want instances connected to this network to be able to talk to the openvswitch management interface.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-07-15 13:35:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							3d8dd1c921 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://git-wip-us.apache.org/repos/asf/cloudstack  
						
						 
						
						
						
						
					 
					
						2014-07-14 17:30:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Amogh Vasekar 
							
						 
					 
					
						
						
						
						
							
						
						
							c30821f703 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6671: Missing patch in master  
						
						 
						
						
						
						
					 
					
						2014-07-14 17:00:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							62e63a1bf7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6358: Missing patches in master for VMware  
						
						 
						
						
						
						
					 
					
						2014-07-14 16:54:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Amogh Vasekar 
							
						 
					 
					
						
						
						
						
							
						
						
							09069fcc87 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6358: Add missing patches in master for KVM  
						
						 
						
						
						
						
					 
					
						2014-07-14 16:51:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							6831ed4026 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6358: Missing patches in master branch  
						
						 
						
						
						
						
					 
					
						2014-07-14 15:17:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							5143fe404b 
							
						 
					 
					
						
						
							
							When instance.name.flag is set to true, append user-supplied name with legacy prefix to VM name appears in vCenter.  
						
						 
						
						
						
						
					 
					
						2014-07-14 14:53:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							e1095b0110 
							
						 
					 
					
						
						
							
							revert the change made by commit: a600d840  
						
						 
						
						
						
						
					 
					
						2014-07-14 14:10:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ynojima 
							
						 
					 
					
						
						
						
						
							
						
						
							e7392cdac6 
							
						 
					 
					
						
						
							
							Remove "--output" option from qemu-img info command call  
						
						 
						
						... 
						
						
						
						since the option is not supported by qemu-img in CentOS 6.3 
						
						
					 
					
						2014-07-13 00:33:16 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							e85d1f911c 
							
						 
					 
					
						
						
							
							Some minor fixes in simulator code  
						
						 
						
						
						
						
					 
					
						2014-07-09 13:20:28 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							362f875a3f 
							
						 
					 
					
						
						
							
							Detach disks before cleaning up of VMware worker VM.  
						
						 
						
						
						
						
					 
					
						2014-07-08 14:47:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Frank.Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							62e005b97e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6278  
						
						 
						
						... 
						
						
						
						Baremetal Advanced Networking support 
						
						
					 
					
						2014-07-07 16:06:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Frank.Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							65497b69c7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6278  
						
						 
						
						... 
						
						
						
						Baremetal Advanced Networking support 
						
						
					 
					
						2014-07-07 14:52:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Frank.Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							ce1b633daf 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6278  
						
						 
						
						... 
						
						
						
						Baremetal Advanced Networking support 
						
						
					 
					
						2014-07-07 11:46:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Frank.Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							7b444183db 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6278  
						
						 
						
						... 
						
						
						
						Baremetal Advanced Networking support 
						
						
					 
					
						2014-07-07 11:37:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							8cf94c9ec1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7069. [VMware] While setting 'numCoresPerSocket' property for a Virtual Machine in VMware  
						
						 
						
						... 
						
						
						
						add a check to ensure the vSphere version is 5.0 or above. 
						
						
					 
					
						2014-07-07 14:36:58 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							4f969057b2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7030. After the restart of MS in a clustered MS pool, not all hung worker VMs are recycled.  
						
						 
						
						... 
						
						
						
						Recycle worker VMs that originally belonged to other management servers too because in case of MS restart, the owner MS might change. 
						
						
					 
					
						2014-07-07 13:38:47 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							a413536f90 
							
						 
					 
					
						
						
							
							Added a simulator based test for VM sync  
						
						 
						
						
						
						
					 
					
						2014-07-07 12:57:55 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							b9145beab6 
							
						 
					 
					
						
						
							
							Fix CID 1116267 Don't modify the set while the iterator is still in use.  
						
						 
						
						
						
						
					 
					
						2014-07-04 16:48:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							a600d8408e 
							
						 
					 
					
						
						
							
							Fixed Resource Leaks, null dereferences, few other issues reported by coverity  
						
						 
						
						
						
						
					 
					
						2014-07-04 16:17:58 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							97d296bfbd 
							
						 
					 
					
						
						
							
							Fixed Coverity reported performance issues like inefficient string concatenations, wrong boxing or unboxing types, inefficent map element retrievals  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-07-01 22:06:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							4f5df54d5c 
							
						 
					 
					
						
						
							
							Some fixes in the simulator  
						
						 
						
						... 
						
						
						
						1. Fixed JSON response deserialization. While creating a mock a JSON can be passed which will be deserialized into a response object and returned from agent layer.
For e.g. for a mock corresponding to StopCommand, a response like "{"com.cloud.agent.api.StopAnswer":{"result":false,"wait":0}}" can be passed.
2. Ability to mock PingCommand (returned as part of getCurrentStatus() agent method). As a part of this a mocked VM state report can be returned.
For e.g. {"com.cloud.agent.api.PingRoutingWithNwGroupsCommand":{"newGroupStates":{},"newStates":{},"_hostVmStateReport":{"v-2-VM":{"state":"PowerOn","host":"SimulatedAgent.e6df7732-69b2-429b-9b6a-3e24dddfa2e0"},"i-2-5-VM":{"state":"PowerOff","host":"SimulatedAgent.e6df7732-69b2-429b-9b6a-3e24dddfa2e0"}},"_gatewayAccessible":true,"_vnetAccessible":true,"hostType":"Routing","hostId":3,"contextMap":{},"wait":0}} 
						
						
					 
					
						2014-07-01 15:26:12 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							03b1e86bde 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7003  
						
						 
						
						
						
						
					 
					
						2014-06-30 10:17:50 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							d5fea10222 
							
						 
					 
					
						
						
							
							Cs tries to destroy vlan object on XS host when destroying VM, if the VLAN object is being used, CS expects the exception, lower the log level here  
						
						 
						
						
						
						
					 
					
						2014-06-27 15:13:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							54d7e8dcd3 
							
						 
					 
					
						
						
							
							Destroy unplugged VIFs before creating a VIF for a VM, and reuse the device id  
						
						 
						
						
						
						
					 
					
						2014-06-27 15:00:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							69e86cb459 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6453: [GPU] Windows 2012 Server instance created with vGPU offering is not coming up after installing PV drivers.  
						
						 
						
						
						
						
					 
					
						2014-06-27 15:58:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							71f76edf71 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6996 Adding cluster to legacy zone failed  
						
						 
						
						... 
						
						
						
						Lookup zone_id field in legacy_zones table to search the table for legacy zone.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2014-06-27 14:01:39 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							cd0ef09344 
							
						 
					 
					
						
						
							
							Fix typo and add the right exception to the error map.  
						
						 
						
						
						
						
					 
					
						2014-06-25 15:51:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							f756d4aa33 
							
						 
					 
					
						
						
							
							Make job info universally available across management server and resource agents  
						
						 
						
						
						
						
					 
					
						2014-06-24 16:28:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							3d9eaf0753 
							
						 
					 
					
						
						
							
							Fixed some spacing issues from 4d6c682f18d9bca50c145b55d8fa61ea1ab71755  
						
						 
						
						
						
						
					 
					
						2014-06-24 15:27:06 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							b2283d7a28 
							
						 
					 
					
						
						
							
							Fixed few resource leaks and added secstoragefirewallcfg command support to simulator  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-06-24 23:19:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								punith-cloudbyte 
							
						 
					 
					
						
						
						
						
							
						
						
							4d6c682f18 
							
						 
					 
					
						
						
							
							supporting nfs protocol and resize feature for managed storage for xenserver  
						
						 
						
						... 
						
						
						
						resize feature refactored
Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com> 
						
						
					 
					
						2014-06-24 15:16:45 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							be028974da 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6967: Now with module!"  
						
						 
						
						... 
						
						
						
						This reverts commit 189972bc7c9e73abff392429eda298f9f837992e.
Conflicts:
	plugins/hypervisors/ovm3 
						
						
					 
					
						2014-06-24 10:23:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							91e300eb82 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6967 merge problem resolution"  
						
						 
						
						... 
						
						
						
						This reverts commit 4610c76fa9178ca056ad523cdf980a7ee3533ef2. 
						
						
					 
					
						2014-06-24 10:21:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							d69e14323a 
							
						 
					 
					
						
						
							
							Revert "rats"  
						
						 
						
						... 
						
						
						
						This reverts commit aa1ce9a3632d636a02c875b41275eb60bc37e3ba. 
						
						
					 
					
						2014-06-24 10:21:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							aa1ce9a363 
							
						 
					 
					
						
						
							
							rats  
						
						 
						
						
						
						
					 
					
						2014-06-23 16:39:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Funs Kessen 
							
						 
					 
					
						
						
						
						
							
						
						
							4610c76fa9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6967 merge problem resolution  
						
						 
						
						
						
						
					 
					
						2014-06-23 15:08:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Funs 
							
						 
					 
					
						
						
						
						
							
						
						
							189972bc7c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6967: Now with module!  
						
						 
						
						... 
						
						
						
						Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit 1516b041bc762535b8f2e74bcb1e6594e5657f86) 
						
						
					 
					
						2014-06-23 12:39:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Funs 
							
						 
					 
					
						
						
						
						
							
						
						
							8a485b9b59 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6967: Initial OVM3 drop  
						
						 
						
						... 
						
						
						
						Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit ed47763e2525a21fa4578d199492462d0fb1c7ef)
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
	plugins/pom.xml
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	ui/scripts/docs.js 
						
						
					 
					
						2014-06-23 12:39:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							5cbb182c6d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6636: [Windows] Can not create Template from ROOT snapshot on Windows management server with Xen/NFS storage type. This change is only for XenServer with NFS Storage Server. Will fix remaining when we touch them.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2014-06-19 09:35:26 +05:30