Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							98183e905d 
							
						 
					 
					
						
						
							
							Add Apache License.  
						
						
						
						
					 
					
						2014-01-17 11:28:14 +00:00 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							c0f60651b9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5690: Added upgarde template support for 4.3 64 bit templates. Changed min required version for VR to 4.3  
						
						
						
						
					 
					
						2014-01-17 12:51:16 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bd79fb33a6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5870: API support for retrieving user data  
						
						
						
						
					 
					
						2014-01-16 15:31:18 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							14e399410b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5696: fix a regression caused by out-of-band sync changes  
						
						
						
						
					 
					
						2014-01-15 16:22:27 -08:00 
						 
				 
			
				
					
						
							
							
								sbalineni 
							
						 
					 
					
						
						
						
						
							
						
						
							cc2b1c4961 
							
						 
					 
					
						
						
							
							Contrail plugin fixes -master branch, single commit, no transaction wrappers  
						
						... 
						
						
						
						Signed-off-by: Sheng Yang <sheng.yang@citrix.com> 
						
						
					 
					
						2014-01-15 14:11:49 -08:00 
						 
				 
			
				
					
						
							
							
								Sachchidanand Vaidya 
							
						 
					 
					
						
						
						
						
							
						
						
							0bff705621 
							
						 
					 
					
						
						
							
							Add L3VPN isolation method for contrail plugin  
						
						... 
						
						
						
						Signed-off-by: Sheng Yang <sheng.yang@citrix.com> 
						
						
					 
					
						2014-01-14 13:55:35 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							68b8891c62 
							
						 
					 
					
						
						
							
							Removed all reminants of the IdentityService.  Created the KeysManager to move the management  
						
						... 
						
						
						
						of keys out of management server 
						
						
					 
					
						2014-01-14 13:11:35 -08:00 
						 
				 
			
				
					
						
							
							
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							af657b3d71 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5861: networks that failed to implement can not be destroyed  
						
						... 
						
						
						
						introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
	server/src/com/cloud/user/DomainManagerImpl.java 
						
						
					 
					
						2014-01-13 23:28:35 +05:30 
						 
				 
			
				
					
						
							
							
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							470f251cbb 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5849: Failed shutdown of the network causes network state to  
						
						... 
						
						
						
						be changed to 'Implemented'
Wrong network state transition
s_fsm.addTransition(State.Shutdown, Event.OperationFailed,State.Implemented
fix keeps state as Shutdown 
						
						
					 
					
						2014-01-13 17:47:47 +05:30 
						 
				 
			
				
					
						
							
							
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							6e902f8354 
							
						 
					 
					
						
						
							
							Fix Null pointer in CreateVlanIpRangeCmd  
						
						
						
						
					 
					
						2014-01-11 10:09:52 -07:00 
						 
				 
			
				
					
						
							
							
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							8ee61f3a57 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5502 createVlanIpRange, allow untagged to be accepted per previous use,  
						
						... 
						
						
						
						equate empty string to untagged in api parameter input 
						
						
					 
					
						2014-01-10 17:09:41 -07:00 
						 
				 
			
				
					
						
							
							
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							42e53702a2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5732 [UI] Search is not working in Affinity Groups panel  
						
						... 
						
						
						
						- Added keyword support
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
	api/src/org/apache/cloudstack/query/QueryService.java
	server/src/com/cloud/api/query/QueryManagerImpl.java 
						
						
					 
					
						2014-01-10 14:45:08 -08:00 
						 
				 
			
				
					
						
							
							
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							fc082832d3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5853  
						
						... 
						
						
						
						Create two storage pools, one with storage tag X, one with storage tag Y.
Create a service offering with storage tag X.
Create a disk offering with storage tag Y.
Attempt to deploy a virtual machine with a datadisk, using given offerings, it fails.
Deployment planner keeps a global object 'avoid'. It loops through each volume to
be created, asking storage allocators for matching pools, passing this avoid object.
First disk matches a pool or pools, adds ALL other pools to avoid object, then
deployment planner attaches matching pools to a list for that disk.
Second disk matches a pool, adds all other pools to avoid object, then deployment
planner says "wait, matching pool is in avoid, can't use it". Oops. In fact, at this
point ALL pools are in avoid (unless there are other pools that have both tags).
Need to remove matching pool from the avoid set during each select phase. 
						
						
					 
					
						2014-01-10 11:55:54 -07:00 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							5bf78b82c0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4904: Unable to see a derieved template if the  
						
						... 
						
						
						
						parent template is deleted. Modified template_view so that removed(or InActive) templates also be there in the view.
Previous behavior of listing templates and state column in vm_templates will be the same. 
						
						
					 
					
						2014-01-10 10:26:10 -08:00 
						 
				 
			
				
					
						
							
							
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							7053c222f9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5651 deployVm: customparameters param name has to be changed  
						
						... 
						
						
						
						Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
	api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java 
						
						
					 
					
						2014-01-10 10:01:43 -08:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							6944bf9bba 
							
						 
					 
					
						
						
							
							Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials  
						
						
						
						
					 
					
						2014-01-09 22:02:43 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							ae35782ccd 
							
						 
					 
					
						
						
							
							Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials  
						
						
						
						
					 
					
						2014-01-09 21:36:34 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1e2e1ea051 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues  
						
						
						
						
					 
					
						2014-01-09 14:29:13 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							0965adb003 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5672: Fix VM work job serialization issues in Add/Remove nic  
						
						
						
						
					 
					
						2014-01-09 14:29:12 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							8c93bd6080 
							
						 
					 
					
						
						
							
							CLOUDSTACK-669: Convert volume snapshot orchestration flow to make it be serialized with other VM operations  
						
						
						
						
					 
					
						2014-01-09 14:29:12 -08:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							03118c2969 
							
						 
					 
					
						
						
							
							Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)  
						
						
						
						
					 
					
						2014-01-09 14:44:35 -07:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							5c1d639bc4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5829:  
						
						... 
						
						
						
						listvms should return the diskoffering id when deployed with an iso 
						
						
					 
					
						2014-01-08 18:32:51 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ac8bc74269 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5840:Remove old API method.  
						
						
						
						
					 
					
						2014-01-08 18:11:12 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							649d9d927f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5840:Migration from NFS to S3 should be done in one API  
						
						... 
						
						
						
						(updateCloudToUseObjectStore) instead of two APIs. 
						
						
					 
					
						2014-01-08 17:25:13 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							07557eb570 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5839 : return canEnableIndividualService in listNetworkServiceProvidersResponse  
						
						
						
						
					 
					
						2014-01-08 14:40:10 -08:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							850bc9fa82 
							
						 
					 
					
						
						
							
							Hook the OpenDaylight plugin into CloudStack  
						
						
						
						
					 
					
						2014-01-08 15:58:08 +01:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							b15431e574 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5810: addSecondaryIp to vm's nic - derive the ip owner from the vm instance account, not from the caller  
						
						
						
						
					 
					
						2014-01-06 17:09:14 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							647ea6e2d0 
							
						 
					 
					
						
						
							
							listNics API: added optional networkId parameter allowing to list nics by network id for the specific vm  
						
						
						
						
					 
					
						2014-01-06 17:09:14 -08:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							6d0dbf5968 
							
						 
					 
					
						
						
							
							check for BroadcastDomainTypes on sourceNatIp  
						
						
						
						
					 
					
						2014-01-06 22:13:51 +01:00 
						 
				 
			
				
					
						
							
							
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							8b151c98c2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5403: Shared network - None of PF, LB rules work after router  
						
						... 
						
						
						
						restart, firewall rules dropped from iptables post restart
on VR restart, not all public IP's associated with the network are sent
with IpAssocCmd to VR. This fix will ensure all the ip's associated with
the network irrespective of the account are sent as part of
IpAssocCommand
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2013-12-27 14:27:57 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							526af5e326 
							
						 
					 
					
						
						
							
							Included guestOsId to userVmResponse - as we let to change this param through updateVm call, we should return it in the response  
						
						
						
						
					 
					
						2013-12-26 13:28:29 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							5d262d7b59 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5648:CopyTemplate and CopyISO across zones fails after NFS  
						
						... 
						
						
						
						migration to S3. 
						
						
					 
					
						2013-12-26 12:39:39 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							03226ba539 
							
						 
					 
					
						
						
							
							Added deviceId parameter to the NicResponse. This information can be useful for the user if he wants to see the order of the networks in his vm  
						
						
						
						
					 
					
						2013-12-24 15:34:43 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							914bc46484 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5390: when calculate index (page #) in NetworkManager, rely on fact that getStartIndex() returned by API, returns pageSize*(page-1). So to get index(page), you need to do the reverse calculation  
						
						
						
						
					 
					
						2013-12-23 16:28:06 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fbba17e68c 
							
						 
					 
					
						
						
							
							Resource metadata support for cloudStack user  
						
						
						
						
					 
					
						2013-12-23 14:25:07 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							79e64aa535 
							
						 
					 
					
						
						
							
							Resource metadata support for Disk Offering  
						
						
						
						
					 
					
						2013-12-23 12:36:13 -08:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							f083f91b0b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5281:  
						
						... 
						
						
						
						Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the vms at the moment. 
						
						
					 
					
						2013-12-20 15:33:37 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							62bb5d8848 
							
						 
					 
					
						
						
							
							fix checkstyle  
						
						
						
						
					 
					
						2013-12-19 15:05:58 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							8caf52c6bc 
							
						 
					 
					
						
						
							
							add xenserver 6.2.0 hotfix support, to optimize vdi copy  
						
						... 
						
						
						
						add xenserver hot fix
Conflicts:
	api/src/com/cloud/vm/VirtualMachineName.java
	core/src/com/cloud/host/HostInfo.java
	core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
	deps/XenServerJava/src/com/xensource/xenapi/VDI.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
	engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
	engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
	server/src/com/cloud/configuration/Config.java 
						
						
					 
					
						2013-12-19 14:15:41 -08:00 
						 
				 
			
				
					
						
							
							
								edison su 
							
						 
					 
					
						
						
						
						
							
						
						
							9c77f68095 
							
						 
					 
					
						
						
							
							Revert "Remove uncessary changes."  
						
						... 
						
						
						
						This reverts commit fcab2b776a252de4e6159de76b89f4fc776d5bca. 
						
						
					 
					
						2013-12-19 13:35:52 -08:00 
						 
				 
			
				
					
						
							
							
								edison su 
							
						 
					 
					
						
						
						
						
							
						
						
							336241be76 
							
						 
					 
					
						
						
							
							Remove uncessary changes.  
						
						
						
						
					 
					
						2013-12-19 13:35:37 -08:00 
						 
				 
			
				
					
						
							
							
								edison su 
							
						 
					 
					
						
						
						
						
							
						
						
							02ace3442d 
							
						 
					 
					
						
						
							
							0001-Fixed-issue-with-DataStoreDrivers-not-being-able-to-  
						
						
						
						
					 
					
						2013-12-19 13:35:21 -08:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							1c0b8db01b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4941:  
						
						... 
						
						
						
						Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics 
						
						
					 
					
						2013-12-18 16:27:20 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							afcf967d24 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-4941:"  
						
						... 
						
						
						
						This reverts commit 231e7c01f2415c1f25d6a2715b7469fe7fcfe771. 
						
						
					 
					
						2013-12-18 16:01:37 -08:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							231e7c01f2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4941:  
						
						... 
						
						
						
						During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics 
						
						
					 
					
						2013-12-18 14:58:37 -08:00 
						 
				 
			
				
					
						
							
							
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							95364a4022 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5531  
						
						... 
						
						
						
						Initial support for vhd, raw, vmdk image formats on KVM. Tested all formats with local and CLVM. 
						
						
					 
					
						2013-12-16 14:32:51 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							9df10718e4 
							
						 
					 
					
						
						
							
							Resource metadata support for S2SVpnConnection  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java
	setup/db/db/schema-421to430.sql 
						
						
					 
					
						2013-12-12 16:39:02 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							cf0a11e45a 
							
						 
					 
					
						
						
							
							pull merges  
						
						
						
						
					 
					
						2013-12-12 13:00:26 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							be5e5cc641 
							
						 
					 
					
						
						
							
							All Checkstyle problems corrected  
						
						
						
						
					 
					
						2013-12-12 12:26:07 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							9a21afb50b 
							
						 
					 
					
						
						
							
							Resource metadata support for customer gateway  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java 
						
						
					 
					
						2013-12-12 10:16:30 -08:00