miguelaferreira 
							
						 
					 
					
						
						
						
						
							
						
						
							ea0dec77d9 
							
						 
					 
					
						
						
							
							Refactor DbUpgradeUtils  
						
						 
						
						... 
						
						
						
						- Move database access code to new class DatabaseAccessObject.
    This was done to ease the effort of testing, since
    DbUpgradeUtils has a static API and it is harder to mock
    static things with Mockito.
  - Log exceptions even if ignored
  - Add unit tests for both DbUpgradeUtils and DatabaseAccessObject
  - DbUpgradeUtils.dropTableColumnsIfExist(...) no longer throws
CloudRuntimeException to make it consistent with the other methods in
the class
Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-03-06 14:48:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							830328b63d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6199:  Hide action events for Vm/Volume commands when the resources have display flag=0.  
						
						 
						
						... 
						
						
						
						Introduce generic BaseAsync(Vm/Volume)Cmd to make get the flag value for logging action events.
Rename the db field as display rather than display_event in keeping with the convention 
						
						
					 
					
						2014-03-05 16:40:44 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							d0ae4d9a9f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5920:Add interface to ControlledEntity to return IAM  
						
						 
						
						... 
						
						
						
						entity type. 
						
						
					 
					
						2014-03-05 09:40:55 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							339c4f4c3f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6199: Action Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature.  
						
						 
						
						... 
						
						
						
						For root admin - s/he should be able to see all the events despite the value of the flag. 
						
						
					 
					
						2014-03-04 14:59:30 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bbf5a912c6 
							
						 
					 
					
						
						
							
							list* APIs - added parameter helping to filter by "display" flag (available to ROOT admin only)  
						
						 
						
						
						
						
					 
					
						2014-03-03 14:37:46 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d9a4e038a0 
							
						 
					 
					
						
						
							
							Enhanced updateVirtualMachine API with optional parameter "name" - to allow update hostName for the virtual machine  
						
						 
						
						
						
						
					 
					
						2014-02-28 14:35:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							93d2c8c3ed 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6184: set display=true by default for all resource details  
						
						 
						
						
						
						
					 
					
						2014-02-27 10:55:47 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							624139d8ef 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6172: Volume is not retaining same uuid when migrating from one storage to another.  
						
						 
						
						
						
						
					 
					
						2014-02-26 14:42:34 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							d1efdca506 
							
						 
					 
					
						
						
							
							Findbugs: Fix Upgrade430to440.java:119, ES_COMPARING_STRINGS_WITH_EQ,  
						
						 
						
						... 
						
						
						
						Priority: High 
						
						
					 
					
						2014-02-24 17:01:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e2ec094722 
							
						 
					 
					
						
						
							
							Display flag support for VpnConnection/VpnGateway/RemoteAccessVpn  
						
						 
						
						
						
						
					 
					
						2014-02-21 14:51:22 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							0f489732c8 
							
						 
					 
					
						
						
							
							Display flag support for LB/InternalLB/NetworkACL rules  
						
						 
						
						
						
						
					 
					
						2014-02-21 14:03:10 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							92064e347a 
							
						 
					 
					
						
						
							
							Display flag support for autoscale vmGroup and vmProfile  
						
						 
						
						
						
						
					 
					
						2014-02-21 11:52:50 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							27a790bdc1 
							
						 
					 
					
						
						
							
							DisplayFlag update support for PF/Firewall/EgressFirewall rules  
						
						 
						
						
						
						
					 
					
						2014-02-21 11:06:52 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2f7bfc0c73 
							
						 
					 
					
						
						
							
							Display flag support for publicIpAddress and VPC. Once set to false, the object is not listed to the regular user. Available to be set by Root admin only  
						
						 
						
						
						
						
					 
					
						2014-02-20 17:15:42 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							3136401d40 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6083 corrected firewall rule cidr load issue  
						
						 
						
						
						
						
					 
					
						2014-02-13 14:42:38 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							4305d817ba 
							
						 
					 
					
						
						
							
							External UUID control support for PublicIpAddress/RemoteAccessVpn/PortForwardingRule/S2SVpnGateway/S2SVpnConnection  
						
						 
						
						
						
						
					 
					
						2014-02-05 15:56:40 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							9641e1dbee 
							
						 
					 
					
						
						
							
							External UUID control support for NetworkACLList/LoadBalancer/ApplicationLoadBalancer  
						
						 
						
						
						
						
					 
					
						2014-02-05 10:36:21 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							adf6026d21 
							
						 
					 
					
						
						
							
							SnapshotDetailsVO doesn't have a display field even though it is required in the searchbuilder in ResourceDetailsDaoBase  
						
						 
						
						... 
						
						
						
						java.lang.AssertionError: Searching for a field that's not there: display
    at com.cloud.utils.db.SearchBase.set(SearchBase.java:219)
    at com.cloud.utils.db.SearchBase$Interceptor.intercept(SearchBase.java:475) 
						
						
					 
					
						2014-02-05 17:46:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							8a9d9798d9 
							
						 
					 
					
						
						
							
							Fix camelcasing inconsistency causing an assertion error.  
						
						 
						
						... 
						
						
						
						java.lang.AssertionError: Searching for a field that's not there: serviceName
	at com.cloud.utils.db.SearchBase.set(SearchBase.java:219)
	at com.cloud.utils.db.SearchBase$Interceptor.intercept(SearchBase.java:475)
	at com.cloud.network.dao.MonitoringServiceVO$$EnhancerByCGLIB$$84195222.getServiceName(<generated>)
	at com.cloud.network.dao.MonitoringServiceDaoImpl.<init>(MonitoringServiceDaoImpl.java:41) 
						
						
					 
					
						2014-02-05 17:46:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							a24263fe81 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db.  
						
						 
						
						
						
						
					 
					
						2014-02-05 15:44:09 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							fdb25d6f5b 
							
						 
					 
					
						
						
							
							Resource metadata support for autoscaleVmProfile CS object  
						
						 
						
						
						
						
					 
					
						2014-01-29 14:57:00 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							c53778c333 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5810 updated null checks and preparestmt and resultset close  
						
						 
						
						... 
						
						
						
						Closing the prepare statement and result set and assigning null to the object after close. 
						
						
					 
					
						2014-01-23 18:27:03 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							c0da0a884a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5921:S3 security key is stored in DB unencrypted  
						
						 
						
						
						
						
					 
					
						2014-01-21 14:34:32 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							569b558b92 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5810 Added upgrade changes for updating accountid and domainid of nic secondary ip  
						
						 
						
						
						
						
					 
					
						2014-01-20 16:05:03 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							c8f6ec043d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5892: Disabled removal of old system Vm templates during upgrades. Updated hyperV template URL and checksum  
						
						 
						
						
						
						
					 
					
						2014-01-17 17:13:40 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7164fc6e73 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5696: Fix sync issue with out-of-band changes  
						
						 
						
						
						
						
					 
					
						2014-01-15 13:11:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							9aaea28d0d 
							
						 
					 
					
						
						
							
							Fix typo  
						
						 
						
						
						
						
					 
					
						2014-01-15 15:20:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							ba96c8cadf 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5408 [Automation] Failed to deploy vm in vmware environment with error "due to java.io.IOException: Cannot run program "mount": java.io.IOException: error=12, Cannot allocate memory"  
						
						 
						
						... 
						
						
						
						Bump up RAM size of system offering for SSVM to 512MB
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2014-01-15 01:45:12 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							9486a9652e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5852: router search in DomainDouterDao using AllFieldsSearch filters few routers due to router_network_ref join. Created a seperate search to list running routers with filters.  
						
						 
						
						... 
						
						
						
						Conflicts:
	engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java 
						
						
					 
					
						2014-01-10 19:58:59 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							bc1eec9f70 
							
						 
					 
					
						
						
							
							Fixed a missing package name  
						
						 
						
						
						
						
					 
					
						2014-01-09 16:48:19 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ae8560b195 
							
						 
					 
					
						
						
							
							Moved security out into its own jar.  Will be adding more to it.  Fixed a few white space issues brought up by checkstyle in eclipse.  
						
						 
						
						
						
						
					 
					
						2014-01-09 16:12:25 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1e2e1ea051 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues  
						
						 
						
						
						
						
					 
					
						2014-01-09 14:29:13 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							f012a2655d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5404: Fix timezone bug in network usage  
						
						 
						
						... 
						
						
						
						(cherry picked from commit d5277a81e644c6db30cff12878cd3708aa28cc86)
Conflicts:
	engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java 
						
						
					 
					
						2014-01-09 14:07:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							f741d99c80 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5790: decrypted ldap hostname and port during upgrade as they are not encrypted now.  
						
						 
						
						... 
						
						
						
						Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2014-01-09 15:50:53 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							3223028fd6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5841:Snapshots taken before migration NFS to S3 can not be  
						
						 
						
						... 
						
						
						
						used cross-zone. 
						
						
					 
					
						2014-01-08 17:43:06 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							cbe2560a78 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5303: fix incorrect resource count (snapshot, secondary_storage)  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 4bb85cd7f921d66eabe72d00dcde817affd48732)
Conflicts:
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java 
						
						
					 
					
						2014-01-08 15:38:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							c3d8e207c8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5314: Negative (-ve) values for primary storage and volumes are shown in the resource count table.  
						
						 
						
						
						
						
					 
					
						2014-01-07 15:07:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							95fa931ff2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5515: #cpu ,cpuspeed and ram is set to NULL in usage db(usage_vm_instance table) after vm stop and start Fixed populating usage event details in usage db on vm start/upgrade/dynamic_scale  
						
						 
						
						
						
						
					 
					
						2013-12-30 12:20:33 +05:30