Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							0502d2f375 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5697 This patchset fixes a bug with the recently merged  
						
						 
						
						... 
						
						
						
						vxlan code. Users can set a physical network to isolation type 'vxlan',
put public traffic on that physical network, and it will still attempt
to use 'vlan' isolation on the KVM hosts. This is going to be an issue
for other isolation types as well, but I'm not familiar with them, so
I'm just fixing vxlan for now. 
						
						
					 
					
						2014-01-27 12:11:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							d40e52776a 
							
						 
					 
					
						
						
							
							Add ResourceType annotation for ListTemplatesCmd.  
						
						 
						
						
						
						
					 
					
						2014-01-27 10:46:15 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							8f8cd21dec 
							
						 
					 
					
						
						
							
							EntityType value for SSHKeyPair and ResourceTag  
						
						 
						
						
						
						
					 
					
						2014-01-24 22:34:18 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							bc45d33f19 
							
						 
					 
					
						
						
							
							@ACL and EntityType for Network commands  
						
						 
						
						
						
						
					 
					
						2014-01-24 22:27:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							4808c0fdcb 
							
						 
					 
					
						
						
							
							@ACL and EntityType for VPC commands  
						
						 
						
						
						
						
					 
					
						2014-01-24 22:14:50 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							285f23f11b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5779: Generalize calling to execute or create file for KVM  
						
						 
						
						
						
						
					 
					
						2014-01-24 18:28:25 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							e4c188a5cb 
							
						 
					 
					
						
						
							
							Default accessType is Use - Read and Use  
						
						 
						
						
						
						
					 
					
						2014-01-24 18:16:59 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							4a30102ca8 
							
						 
					 
					
						
						
							
							ListSecurityGroupCmd should have the EntityType added to the command  
						
						 
						
						
						
						
					 
					
						2014-01-24 17:58:35 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							1d98ef9821 
							
						 
					 
					
						
						
							
							@ACL and EntityType for FirewallRule commands  
						
						 
						
						
						
						
					 
					
						2014-01-24 17:06:11 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							695de1eaed 
							
						 
					 
					
						
						
							
							@ACl and @EntityType annotations for: AffinityGroup, AutoScale, Events  
						
						 
						
						
						
						
					 
					
						2014-01-24 17:06:09 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							af14699c4c 
							
						 
					 
					
						
						
							
							fixing the build _ AffinityGroup command changes  
						
						 
						
						
						
						
					 
					
						2014-01-23 18:17:43 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							96a64b933e 
							
						 
					 
					
						
						
							
							- Adding OperateEntry during loading of commands  
						
						 
						
						... 
						
						
						
						- Replace ListEntry By OperateEntry
- ApiDispatcher should pass on the API name 
						
						
					 
					
						2014-01-23 17:50:59 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							4925b9f6a1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2031:support for number of ips per nic limit needs to be added for the multiple ip address per nic  
						
						 
						
						
						
						
					 
					
						2014-01-23 18:14:12 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							33cd1ab921 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac  
						
						 
						
						
						
						
					 
					
						2014-01-22 11:23:51 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							a0197006ef 
							
						 
					 
					
						
						
							
							Removed "host" config parameter definition from ClusterManager interface as it got moved to cloud-api package  
						
						 
						
						
						
						
					 
					
						2014-01-21 17:19:52 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							452c20b242 
							
						 
					 
					
						
						
							
							Configuration: define "host" global config parameter in cloud-api package instead of ClusterManager as the parameter is mostly used by sevices components running remotely (consoleProxy, secondarystorage), or by third party integrators.  
						
						 
						
						... 
						
						
						
						Also intoroduced one more global config parameter - api.servlet.endpoint (default value is "http://localhost:8080/client/api ?"). The parameter defines API end point. Can be used by CS components/services deployed remotely, for sending CS API requests 
						
						
					 
					
						2014-01-20 13:37:52 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							929fbabaa2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-01-17 14:37:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							6583cb3800 
							
						 
					 
					
						
						
							
							Add listAclGroupsByAccount to QuerySelector adapters and remove  
						
						 
						
						... 
						
						
						
						AclProxyService interface. 
						
						
					 
					
						2014-01-14 16:19:25 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							bae498c89e 
							
						 
					 
					
						
						
							
							Handle search of those entities without db view created using new ACL  
						
						 
						
						... 
						
						
						
						model. 
						
						
					 
					
						2014-01-13 21:55:56 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							43f0f901dd 
							
						 
					 
					
						
						
							
							Remove VO and DAO from cloud-engine-schema.  
						
						 
						
						
						
						
					 
					
						2014-01-10 15:57:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							e42a262f6c 
							
						 
					 
					
						
						
							
							Remove old APIs and old security checker plugins. Also use QuerySelector  
						
						 
						
						... 
						
						
						
						adapater in ACL search routine. 
						
						
					 
					
						2014-01-10 14:54:31 -08: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							e6238baa3a 
							
						 
					 
					
						
						
							
							- Adding @ACL and EntityType values to SecurityGroup, Snapshot  
						
						 
						
						... 
						
						
						
						- Correctinf the VM and Volume APIs 
						
						
					 
					
						2014-01-06 16:58:42 -08:00