Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							61b47850f2 
							
						 
					 
					
						
						
							
							Bug fix identified by marvin test.  
						
						 
						
						
						
						
					 
					
						2014-03-03 17:26:16 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							a837ac8873 
							
						 
					 
					
						
						
							
							Adding Operate access check at service layer, since we are not checking access on the command parameter here  
						
						 
						
						
						
						
					 
					
						2014-03-03 13:35:19 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							e5d722654a 
							
						 
					 
					
						
						
							
							Rename IAMEntityType.AclGroup and AclPolicy.  
						
						 
						
						
						
						
					 
					
						2014-03-02 16:06:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							7e4c3b0e92 
							
						 
					 
					
						
						
							
							Pass UUID for scopeId in addIAMPermissionToIAMPolicyCmd and  
						
						 
						
						... 
						
						
						
						removeIAMPermissionFromIAMPolicyCmd. 
						
						
					 
					
						2014-03-02 15:56:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ae9be657e4 
							
						 
					 
					
						
						
							
							Fix IAM VM marvin test.  
						
						 
						
						
						
						
					 
					
						2014-02-28 17:33:10 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							bf479e75ca 
							
						 
					 
					
						
						
							
							Renaming acl to iam in the upgrade code  
						
						 
						
						
						
						
					 
					
						2014-02-26 17:56:38 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							9f47466fea 
							
						 
					 
					
						
						
							
							Fix some issues in renaming iam api, also fix marvin library.  
						
						 
						
						
						
						
					 
					
						2014-02-26 17:30:34 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							45a96e4e4c 
							
						 
					 
					
						
						
							
							renaming Acl to IAM in module.properties for the plugin  
						
						 
						
						
						
						
					 
					
						2014-02-25 17:02:41 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							57b687e8b6 
							
						 
					 
					
						
						
							
							Renaming all beans in the xml files to use IAM insteda of Acl  
						
						 
						
						
						
						
					 
					
						2014-02-25 16:58:42 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							6309887800 
							
						 
					 
					
						
						
							
							iam/server changes: Rename Acl to IAM  
						
						 
						
						
						
						
					 
					
						2014-02-25 16:43:25 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							187f9cd0a2 
							
						 
					 
					
						
						
							
							iam/plugin: Rename Acl to IAM everywhere  
						
						 
						
						
						
						
					 
					
						2014-02-25 16:43:23 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							b2ba6c05b4 
							
						 
					 
					
						
						
							
							Renaming plugin packages to 'iam' instead if 'acl'  
						
						 
						
						
						
						
					 
					
						2014-02-25 16:43:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							f41604fc6c 
							
						 
					 
					
						
						
							
							Renaming AclEntityType --> IAMEntityType  
						
						 
						
						
						
						
					 
					
						2014-02-25 16:43:17 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b78cb2284a 
							
						 
					 
					
						
						
							
							Add marvin integration test for list VM.  
						
						 
						
						
						
						
					 
					
						2014-02-21 15:35:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							42a7d41c55 
							
						 
					 
					
						
						
							
							Adding annotations to router commands  
						
						 
						
						
						
						
					 
					
						2014-02-19 12:22:35 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							bbaa742863 
							
						 
					 
					
						
						
							
							Adding annotations to admin commands  
						
						 
						
						
						
						
					 
					
						2014-02-19 12:22:33 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							f0a9b3b510 
							
						 
					 
					
						
						
							
							@ACL from some commands  
						
						 
						
						
						
						
					 
					
						2014-02-19 12:22:30 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							13e25d2aae 
							
						 
					 
					
						
						
							
							Fixed a bug in constructing search parameters with accountName passed.  
						
						 
						
						
						
						
					 
					
						2014-02-19 11:35:00 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							26e92af62d 
							
						 
					 
					
						
						
							
							Rename IAM api and response package name so that they are following  
						
						 
						
						... 
						
						
						
						convention used by ApiXmlDocWriter. 
						
						
					 
					
						2014-02-18 16:08:06 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ebfe947f41 
							
						 
					 
					
						
						
							
							Fixed some bugs encountered in testing iam-plugin apis.  
						
						 
						
						
						
						
					 
					
						2014-02-14 15:04:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							586ee74000 
							
						 
					 
					
						
						
							
							Clean up SecurityChecker.AccessType and modify code to use them  
						
						 
						
						... 
						
						
						
						consistently. 
						
						
					 
					
						2014-02-14 11:23:05 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							4b75fa806a 
							
						 
					 
					
						
						
							
							Fix a NPE bug in listAclPolicies.  
						
						 
						
						
						
						
					 
					
						2014-02-13 17:57:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							8072e50845 
							
						 
					 
					
						
						
							
							Fixed a bug for listTemplates with TemplateFilter=shared.  
						
						 
						
						
						
						
					 
					
						2014-02-13 16:47:41 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							5bfc75cac9 
							
						 
					 
					
						
						
							
							Fix test build failure.  
						
						 
						
						
						
						
					 
					
						2014-02-13 11:21:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							5854c0bbeb 
							
						 
					 
					
						
						
							
							Fix Path cannot be null error in creating ACL Policy.  
						
						 
						
						
						
						
					 
					
						2014-02-11 22:45:57 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							97ec3f6628 
							
						 
					 
					
						
						
							
							Fix an AclEntityType cast bug.  
						
						 
						
						
						
						
					 
					
						2014-02-11 22:26:52 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							7bab0bc304 
							
						 
					 
					
						
						
							
							Optimize fix for CLOUDSTACK-5987.  
						
						 
						
						
						
						
					 
					
						2014-02-07 16:08:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							63e42d3c47 
							
						 
					 
					
						
						
							
							Handle scopeId=-1 properly, which indicates current caller domain or  
						
						 
						
						... 
						
						
						
						account. 
						
						
					 
					
						2014-02-07 15:56:03 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							0b5b861994 
							
						 
					 
					
						
						
							
							Fix a bug in listParentAclGroups to handle empty parent group case.  
						
						 
						
						
						
						
					 
					
						2014-02-07 14:13:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							3b58a45e04 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-02-07 13:43:36 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							3384633834 
							
						 
					 
					
						
						
							
							Instances UI: Fix case where 'list host' is visible for stopped VM  
						
						 
						
						
						
						
					 
					
						2014-02-07 11:09:18 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							b6db18fae4 
							
						 
					 
					
						
						
							
							Slightly improve the error message to make it clean what the problem actually is  
						
						 
						
						
						
						
					 
					
						2014-02-07 14:10:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							bac2c1e5b4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6049: Give priority to cache stores where data object is  
						
						 
						
						... 
						
						
						
						already there instead of randomly picking one in case there are multiple
cache stores in the scope. 
						
						
					 
					
						2014-02-06 17:19:24 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							04766c6d47 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6048: UI > Infrastructure > socket >  listing > (1) remove LXC, OVM.  
						
						 
						
						... 
						
						
						
						(2) change XenServer label to differentiate XenServer version. 
						
						
					 
					
						2014-02-06 16:55:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							621276715a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6046:CreateVolume from snapshot is failing with S3 as  
						
						 
						
						... 
						
						
						
						secondary storage and zone-wide primary storage. 
						
						
					 
					
						2014-02-06 15:36:26 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							782c530685 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6003 fixing plus refactoring dispatcher" as it breaks API dispatching for commands having Map<String,String> as a parameter type  
						
						 
						
						... 
						
						
						
						This reverts commit 447430c3df38c36d947c44c4aebd961d8cbb14c4.
Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2014-02-06 14:46:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							916728634b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6044: Primary storage list: truncate long values  
						
						 
						
						
						
						
					 
					
						2014-02-06 09:50:41 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							64c61c7202 
							
						 
					 
					
						
						
							
							Fix two NPE exceptions in the Contrail Plugin when contrail is not providing any services on the network.  
						
						 
						
						
						
						
					 
					
						2014-02-06 16:51:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							cbbe3e0cd7 
							
						 
					 
					
						
						
							
							Fix several AssertionErrors caused by improper transaction handling. Rewrite to new way of doing transactions.  
						
						 
						
						
						
						
					 
					
						2014-02-06 16:51:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							1baebebda6 
							
						 
					 
					
						
						
							
							test: Expand LibvirtDomainXMLParserTest with Interface test  
						
						 
						
						
						
						
					 
					
						2014-02-06 14:40:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							41c7e22eee 
							
						 
					 
					
						
						
							
							test: Add test for LibvirtDomainXMLParser  
						
						 
						
						... 
						
						
						
						A couple of changes where made to other classes as well to add
some features to allow more extensive testing. 
						
						
					 
					
						2014-02-06 14:23:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							cecb216caa 
							
						 
					 
					
						
						
							
							fixBugs finding  
						
						 
						
						... 
						
						
						
						fm.equals(format) breaks equals contract
Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-02-06 10:32:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							13e0f293ed 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6001: Fixed hyperv vm console not working for 3 minutes after migration.  
						
						 
						
						
						
						
					 
					
						2014-02-06 13:47:38 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							86cada3b3c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2932:  
						
						 
						
						... 
						
						
						
						Allow deleting of snapshots that have errored out. Simply mark the removed column as there is no physical clean up required. It can land into error state only from allocated/Creating state
 which are states before creation on primary storage works 
						
						
					 
					
						2014-02-05 17:34:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c440d90466 
							
						 
					 
					
						
						
							
							Merge fix for CLOUDSTACK-5987 in master to RBAC.  
						
						 
						
						
						
						
					 
					
						2014-02-05 16:34:01 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							7c0170e3e9 
							
						 
					 
					
						
						
							
							Hook up IAM update for updateTemplatePermission api.  
						
						 
						
						
						
						
					 
					
						2014-02-05 16:04:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e51d472b0c 
							
						 
					 
					
						
						
							
							External UUID control: as only Root admin can change external UUID, so modified @Parameter to enforce the check  
						
						 
						
						
						
						
					 
					
						2014-02-05 15:56:40 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							4305d817ba 
							
						 
					 
					
						
						
							
							External UUID control support for PublicIpAddress/RemoteAccessVpn/PortForwardingRule/S2SVpnGateway/S2SVpnConnection  
						
						 
						
						
						
						
					 
					
						2014-02-05 15:56:40 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							75757e9425 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6031: UI > infrastructure > count > pass listAll=true to all listXXXXXXX API for counting resource.  
						
						 
						
						
						
						
					 
					
						2014-02-05 14:38:16 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							c2c7d33d8e 
							
						 
					 
					
						
						
							
							Detail view UI: Fix embedded list view actions  
						
						 
						
						... 
						
						
						
						Fixes case when detail view has an embedded list view with action, that
the action is handled by detail view instead of list view, causing
unexpected behavior 
						
						
					 
					
						2014-02-05 11:47:04 -08:00