Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							8e4d020cf8 
							
						 
					 
					
						
						
							
							remove nic with dhcp and tests  
						
						 
						
						... 
						
						
						
						Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com> 
						
						
					 
					
						2014-02-13 10:39:02 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							3b58a45e04 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-02-07 13:43:36 -08: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							7c0170e3e9 
							
						 
					 
					
						
						
							
							Hook up IAM update for updateTemplatePermission api.  
						
						 
						
						
						
						
					 
					
						2014-02-05 16:04:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Soheil Eizadi 
							
						 
					 
					
						
						
						
						
							
						
						
							6523c06869 
							
						 
					 
					
						
						
							
							NetworkManager Exception Fix Due to call to getDhcpServiceProvider()  
						
						 
						
						
						
						
					 
					
						2014-02-05 17:14:05 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							7f34282dfa 
							
						 
					 
					
						
						
							
							Removed references to secondarystoragevmmanager from code that doesn't use it.  
						
						 
						
						
						
						
					 
					
						2014-02-05 01:39:15 +00: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							f84375442e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py 
						
						
					 
					
						2014-02-04 12:07:32 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							9b21da65d1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6025:CreateTemplate from snapshot in NFS is failing , after  
						
						 
						
						... 
						
						
						
						migarting to S3 datastore. 
						
						
					 
					
						2014-02-04 11:01:51 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							ca1b340cef 
							
						 
					 
					
						
						
							
							findbugs make use of return of string manipulation  
						
						 
						
						
						
						
					 
					
						2014-02-04 11:21:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							022b9b8f80 
							
						 
					 
					
						
						
							
							Add access for domain wide createAffinityGroup  
						
						 
						
						
						
						
					 
					
						2014-02-03 18:14:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							a6d07c873c 
							
						 
					 
					
						
						
							
							Changes to QuerySelector to list the parent group resources with recursive = true access  
						
						 
						
						
						
						
					 
					
						2014-02-03 17:49:33 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							939b15169c 
							
						 
					 
					
						
						
							
							changes to support the domain wide resources for Network  
						
						 
						
						
						
						
					 
					
						2014-02-03 17:34:03 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b35eb04de3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6017: NPE while creating snapshot multiple times on same Root  
						
						 
						
						... 
						
						
						
						volume with S3 as secondary storage. 
						
						
					 
					
						2014-02-03 12:16:19 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							9778481d85 
							
						 
					 
					
						
						
							
							findbugs: handling of long values and wrappers  
						
						 
						
						
						
						
					 
					
						2014-02-03 20:19:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							d56c5dfc13 
							
						 
					 
					
						
						
							
							Fix for a potential NPE  
						
						 
						
						
						
						
					 
					
						2014-01-31 09:37:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							580ebb0010 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5989: Trying to start a vm while 'vm snapshot' is in progress results in inconsistency  
						
						 
						
						... 
						
						
						
						The fix is to fail the start operation if a vm snapshot is in progress 
						
						
					 
					
						2014-01-31 10:39:43 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							d12422bf68 
							
						 
					 
					
						
						
							
							Add policies to domain group for CreateNetwork usecase for a domain wide shared network  
						
						 
						
						
						
						
					 
					
						2014-01-29 23:56:25 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fdb25d6f5b 
							
						 
					 
					
						
						
							
							Resource metadata support for autoscaleVmProfile CS object  
						
						 
						
						
						
						
					 
					
						2014-01-29 14:57:00 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							72812cdf22 
							
						 
					 
					
						
						
							
							Grant public template permission to domain admin and normal user policy.  
						
						 
						
						
						
						
					 
					
						2014-01-28 17:41:27 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							16a9171f55 
							
						 
					 
					
						
						
							
							Fix trailing whitespace.  
						
						 
						
						
						
						
					 
					
						2014-01-28 14:53:18 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							a26c81178b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5971:Templates created from a snapshots can't be copied to  
						
						 
						
						... 
						
						
						
						other zones. 
						
						
					 
					
						2014-01-28 14:49:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							ebf57654e7 
							
						 
					 
					
						
						
							
							replaced Long instantiations with Autoboxing  
						
						 
						
						... 
						
						
						
						Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-01-25 15:01:03 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							33cd1ab921 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac  
						
						 
						
						
						
						
					 
					
						2014-01-22 11:23:51 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							b5b4607f79 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false  
						
						 
						
						
						
						
					 
					
						2014-01-22 11:17:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c0da0a884a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5921:S3 security key is stored in DB unencrypted  
						
						 
						
						
						
						
					 
					
						2014-01-21 14:34:32 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							90e945fd74 
							
						 
					 
					
						
						
							
							Fixing an issue with expunge logic  
						
						 
						
						
						
						
					 
					
						2014-01-20 16:25:39 -07: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							37332ad9d4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false  
						
						 
						
						
						
						
					 
					
						2014-01-18 18:07:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							929fbabaa2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-01-17 14:37:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a9733b5df2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5731: Use general instance type to categorize VM work jobs to correctly serialize VM operations  
						
						 
						
						
						
						
					 
					
						2014-01-17 11:55:14 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							58a9a9b0cd 
							
						 
					 
					
						
						
							
							only send stop command when agent reports VM running and CS thinks it is stopped.  
						
						 
						
						
						
						
					 
					
						2014-01-17 11:50:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							8a20d89d14 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5895: CreateVolumeFromSnapshot can fail in a multiple pod environment with tagged storagepool  
						
						 
						
						... 
						
						
						
						Changes:
- After finding the storagepool suitable to create the volume, we should not look for more pods 
						
						
					 
					
						2014-01-17 11:22:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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