Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							97bad4f9b3 
							
						 
					 
					
						
						
							
							Fix checkstyle and license issues  
						
						 
						
						
						
						
					 
					
						2014-02-14 18:37:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							15fa2ef8df 
							
						 
					 
					
						
						
							
							findbugs: check for system template id == -> equals()  
						
						 
						
						
						
						
					 
					
						2014-02-14 18:37:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							0d7a96526c 
							
						 
					 
					
						
						
							
							error message containing array content instead of array  
						
						 
						
						
						
						
					 
					
						2014-02-14 18:37:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Hitchins 
							
						 
					 
					
						
						
						
						
							
						
						
							39cfc4968c 
							
						 
					 
					
						
						
							
							AJH Findbugs [8] - Added .toString() to enum.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2014-02-14 18:37:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Hitchins 
							
						 
					 
					
						
						
						
						
							
						
						
							b8c228e151 
							
						 
					 
					
						
						
							
							AJH Findbugs [9] - Added object to map rather than string  
						
						 
						
						... 
						
						
						
						Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2014-02-14 18:37:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							df77c4310a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6103: Pass VM iso information along with  
						
						 
						
						... 
						
						
						
						PrepareForMigrationCommand, so that destination hypervisor can
mount pool. This further exposed an issue for KVM where iso
was not getting cleaned up upon successful migration, fixed as well. 
						
						
					 
					
						2014-02-14 00:34:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							ea5f318c9d 
							
						 
					 
					
						
						
							
							pass isSourceNat to second ip on the same network  
						
						 
						
						
						
						
					 
					
						2014-02-11 14:12:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							11c5574b05 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5966 enable/disable global setting for service monitor in VR  
						
						 
						
						
						
						
					 
					
						2014-02-11 15:35:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e0de79b170 
							
						 
					 
					
						
						
							
							Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command  
						
						 
						
						
						
						
					 
					
						2014-02-10 12:05:59 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							306ffa0218 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6053: While adding a primary or secondary of type smb the password wasn't  
						
						 
						
						... 
						
						
						
						encoded. This cause createStoragePool or addImageStore command to fail if special
characters were present. Updated the code to pass user, password and domain as part
of details while adding primary or secondary. Also made changes on server side to
handle it. 
						
						
					 
					
						2014-02-10 10:29:09 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							4305d817ba 
							
						 
					 
					
						
						
							
							External UUID control support for PublicIpAddress/RemoteAccessVpn/PortForwardingRule/S2SVpnGateway/S2SVpnConnection  
						
						 
						
						
						
						
					 
					
						2014-02-05 15:56:40 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							a873a0efdd 
							
						 
					 
					
						
						
							
							Fixed the build broken by changes made to MonitoringServiceVO  
						
						 
						
						
						
						
					 
					
						2014-02-05 10:37:03 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							9641e1dbee 
							
						 
					 
					
						
						
							
							External UUID control support for NetworkACLList/LoadBalancer/ApplicationLoadBalancer  
						
						 
						
						
						
						
					 
					
						2014-02-05 10:36:21 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							3cfa5fbfe1 
							
						 
					 
					
						
						
							
							Fix camelcasing inconsistency causing an assertion error.  
						
						 
						
						
						
						
					 
					
						2014-02-05 19:32:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							54f32a8e46 
							
						 
					 
					
						
						
							
							Moved the controlling logic for secondary storage vm into place  
						
						 
						
						
						
						
					 
					
						2014-02-05 01:39:17 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							03a424e45a 
							
						 
					 
					
						
						
							
							Removed some useless imports  
						
						 
						
						
						
						
					 
					
						2014-02-05 01:39:16 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							7f34282dfa 
							
						 
					 
					
						
						
							
							Removed references to secondarystoragevmmanager from code that doesn't use it.  
						
						 
						
						
						
						
					 
					
						2014-02-05 01:39:15 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							aaa20947a9 
							
						 
					 
					
						
						
							
							ExternalUUID control support for Firewall and Egress Firewall rules  
						
						 
						
						
						
						
					 
					
						2014-02-04 17:06:04 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7cb4b571c8 
							
						 
					 
					
						
						
							
							ExternalUUID control: enforce checking uuid validity by defining checkUUID method in the corresponding absract class, and performing the check during API command dispatching  
						
						 
						
						
						
						
					 
					
						2014-02-04 15:47:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e5335cd6e4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2789: UpdateVPC shouldn't require name parameter  
						
						 
						
						
						
						
					 
					
						2014-02-04 15:47:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							8065ee445f 
							
						 
					 
					
						
						
							
							External UUID control support for VPC and NetworkACLItemp  
						
						 
						
						
						
						
					 
					
						2014-02-04 15:47:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7cd0ad336b 
							
						 
					 
					
						
						
							
							External UUID control support for AutoscaleVmProfile and AutoscaleVmGroup  
						
						 
						
						
						
						
					 
					
						2014-02-04 15:47:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							6af6ce7e9e 
							
						 
					 
					
						
						
							
							1) Added External UUID control support for network.  
						
						 
						
						... 
						
						
						
						2) Moved UUIDManager interface to cloud-util package 
						
						
					 
					
						2014-02-04 15:47:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Antonio Fornie 
							
						 
					 
					
						
						
						
						
							
						
						
							447430c3df 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6003 fixing plus refactoring dispatcher  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit a9bcc1ea3b7dfd3fcc5c795b0095c77851ebe618)
Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-02-04 13:37:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ea355d7383 
							
						 
					 
					
						
						
							
							listSslCerts: removed an exception thrown when there is no certificate mapped to the lbId specified in the list* command. Exception in the list* command should be thrown only when id specified in the command, is invalid CS id, but never in the case when we can't find data satisfying search criteria. In this case we just return empty list  
						
						 
						
						
						
						
					 
					
						2014-02-03 17:20:28 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fc56f0cf42 
							
						 
					 
					
						
						
							
							Revert "Findbugs: different issues solved(cherry picked from commit" as it breaks UserVm API Response  
						
						 
						
						... 
						
						
						
						This reverts commit fae05560218ef3bcb962bd424ae5dbf5cb8ede68.
Conflicts:
	server/src/com/cloud/dc/DedicatedResourceVO.java 
						
						
					 
					
						2014-02-03 17:20:28 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							657d9e4789 
							
						 
					 
					
						
						
							
							Allow different VLANs have ovveride subnet for shared network  
						
						 
						
						
						
						
					 
					
						2014-02-03 15:03:31 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							f4a96d4c85 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6011 . When detach is called on a deleted volume, avoid the NPE and throw an appropriate exception instead  
						
						 
						
						
						
						
					 
					
						2014-02-03 18:17:25 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							9cb37ec349 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6007. Restore VM command fails with NPE.  
						
						 
						
						... 
						
						
						
						If a VM instance is deployed with startVm=false, then calling restoreVm on the instance fails with NPE
because CS tries to expunge a volume that has not been created in primary store. 
						
						
					 
					
						2014-02-03 12:32:14 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Grizzanti 
							
						 
					 
					
						
						
						
						
							
						
						
							ce4b718f4a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5062: Deleting Load Balancing Rule fails when generating usage events are enabled  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit fc796632ed984f37fdf32e6aedf26d179a70b22f)
Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-02-01 21:08:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							7d0472bdaa 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5995 ; change service offering is not honouring host tags  
						
						 
						
						... 
						
						
						
						- Check host tag when the lastHostId is set. 
						
						
					 
					
						2014-01-31 12:02:44 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							48361d8a8b 
							
						 
					 
					
						
						
							
							Fixed listAutoScaleVmGroups: used to return incorrect value in lbruleid field (wrong parameter was used when search in firewall_rules table - profileId instead of lbRuleId)  
						
						 
						
						
						
						
					 
					
						2014-01-31 09:21:55 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							e8438f1b6d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5566: "Entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@aeb3d75  
						
						 
						
						... 
						
						
						
						and entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@5a0fd1ec belong to
different accounts"  message while deleting multiple events . 
						
						
					 
					
						2014-01-31 17:10:04 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sbalineni 
							
						 
					 
					
						
						
						
						
							
						
						
							ed3e1b95b0 
							
						 
					 
					
						
						
							
							VPC Support for contrail networking  
						
						 
						
						... 
						
						
						
						Signed-off-by: Sheng Yang <sheng.yang@citrix.com> 
						
						
					 
					
						2014-01-30 18:13:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							0e2e6995b7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5997:  
						
						 
						
						... 
						
						
						
						Template state changes side affects 
						
						
					 
					
						2014-01-30 17:59:55 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							02bdb28d76 
							
						 
					 
					
						
						
							
							Resource metadata support for autoscale vm group object  
						
						 
						
						
						
						
					 
					
						2014-01-30 13:04:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							cb073e0634 
							
						 
					 
					
						
						
							
							listAutoscaleVmProfiles: added zoneId to the list of optional api parameters  
						
						 
						
						
						
						
					 
					
						2014-01-30 12:36:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Grizzanti 
							
						 
					 
					
						
						
						
						
							
						
						
							5de9ae0bce 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5496 : Account included in ActionEvents is Project Account ID  
						
						 
						
						... 
						
						
						
						When Action Events are generated and placed on the Event Bus, an
"account" parameter is included with the event. When these events are
generated for resources within projects, this "account" parameter is not
useful as it's the UUID of the project account, instead of the project.
To solve this, I updated ActionEventsUtil class to include a "project"
parameter in the generated events when the resource is being
changed/add/deleted in a project. 
						
						
					 
					
						2014-01-30 17:35:01 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							85d0f8f93a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5916: associateIpAddress leaves an IP in allocating state  
						
						 
						
						
						
						
					 
					
						2014-01-30 17:11:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							20fd2769a9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5660: Migrate vm live migration succeeds but throws error as ""Failed to migrate the system vm"".  
						
						 
						
						
						
						
					 
					
						2014-01-30 16:29:18 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							b38c033d5c 
							
						 
					 
					
						
						
							
							LOUDSTACK-5987: when listTemplates with filter=community/featured, get public templates from all domains in the system, not just parent/child subdomains of the caller  
						
						 
						
						
						
						
					 
					
						2014-01-29 17:12:46 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							37fa8012f8 
							
						 
					 
					
						
						
							
							Resource metadata for autoscaleVmProfile - forgot to add dao mapping to the ResourceMetaDataManagerImpl  
						
						 
						
						
						
						
					 
					
						2014-01-29 14:57:01 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							65c5de1cb6 
							
						 
					 
					
						
						
							
							Removed recently introduced api.servlet.endpoint global config as CS already has config serving the same purpose - 'endpointe.url'  
						
						 
						
						
						
						
					 
					
						2014-01-29 14:57:01 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fdb25d6f5b 
							
						 
					 
					
						
						
							
							Resource metadata support for autoscaleVmProfile CS object  
						
						 
						
						
						
						
					 
					
						2014-01-29 14:57:00 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							920163f24f 
							
						 
					 
					
						
						
							
							findbugs: possible nulpointer derefs  
						
						 
						
						
						
						
					 
					
						2014-01-29 13:09:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							ee1e8a6c2a 
							
						 
					 
					
						
						
							
							findbugs: use system account id instead of null (security considerations  
						
						 
						
						... 
						
						
						
						to be made here) 
						
						
					 
					
						2014-01-29 12:36:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							fef2daf5d4 
							
						 
					 
					
						
						
							
							findbugs: compare strings with equals()  
						
						 
						
						
						
						
					 
					
						2014-01-29 12:06:34 +01:00