Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							9df10718e4 
							
						 
					 
					
						
						
							
							Resource metadata support for S2SVpnConnection  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java
	setup/db/db/schema-421to430.sql 
						
						
					 
					
						2013-12-12 16:39:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							d2c74bcf14 
							
						 
					 
					
						
						
							
							Changes to  RoleBasedEntityAccessChecker to replace Role by Policy  
						
						 
						
						
						
						
					 
					
						2013-12-12 16:30:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							523d9dc3c0 
							
						 
					 
					
						
						
							
							Resource metadata support for customer gateway  
						
						 
						
						
						
						
					 
					
						2013-12-12 14:18:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							cf84733f8b 
							
						 
					 
					
						
						
							
							Resource metadata support for Site2SiteVpnGateway  
						
						 
						
						... 
						
						
						
						Conflicts:
	setup/db/db/schema-421to430.sql 
						
						
					 
					
						2013-12-12 10:15:36 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							ca1e10398d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5454 added upgrade path from 4.2.1 to 4.3  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-12-12 15:36:03 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							5036097659 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5419: missing parameters in configuration table and to remove unused parameters  
						
						 
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2013-12-10 16:49:44 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							5e23f00b1a 
							
						 
					 
					
						
						
							
							add Apache Licensed and add check native  
						
						 
						
						
						
						
					 
					
						2013-12-10 10:37:29 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							69302e147c 
							
						 
					 
					
						
						
							
							fix db  
						
						 
						
						
						
						
					 
					
						2013-12-10 10:37:28 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							fca6d56681 
							
						 
					 
					
						
						
							
							remove private changes  
						
						 
						
						
						
						
					 
					
						2013-12-10 10:36:30 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							dc151115be 
							
						 
					 
					
						
						
							
							AutoScaling without NetScaler  
						
						 
						
						
						
						
					 
					
						2013-12-10 10:35:55 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							be67f5d17a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5428: support NetScaler to be configured exclusively for GSLB  
						
						 
						
						... 
						
						
						
						service and not used for LB
Fix adds a boolean flag to addNetscalerLoadBalancer api, which
will mark added NetScaler for exclusive GSLB service. A netscaler marked
as exclusive gslb service provider is not picked for any guest network's
lb provider. 
						
						
					 
					
						2013-12-10 06:20:58 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							288a81180c 
							
						 
					 
					
						
						
							
							Populate default group, policy, account mapping.  
						
						 
						
						
						
						
					 
					
						2013-12-09 11:29:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							0624fe5d03 
							
						 
					 
					
						
						
							
							remove unused table: ovs_nic_map  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:15 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							d935d3865a 
							
						 
					 
					
						
						
							
							tuna  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:14 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							4e914b7087 
							
						 
					 
					
						
						
							
							re-factor gre controller  
						
						 
						
						... 
						
						
						
						Signed-off-by: tuna <ng.tuna@gmail.com> 
						
						
					 
					
						2013-12-09 23:33:14 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							96188a3730 
							
						 
					 
					
						
						
							
							re-factor gre controller prototype  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:14 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							eaa278d119 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5416. [VMware] Not able to add seventh disk to VM in an upgraded setup.  
						
						 
						
						
						
						
					 
					
						2013-12-09 17:09:57 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Ough 
							
						 
					 
					
						
						
						
						
							
						
						
							88f64b2b93 
							
						 
					 
					
						
						
							
							Changed 'MigrateCommand' to use the global setting value of 'execute.in.sequence.hypervisor.commands'  
						
						 
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2013-12-06 09:41:50 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bd6f706b72 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API  
						
						 
						
						... 
						
						
						
						Conflicts:
	engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
	engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
	plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
	server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
	usage/src/com/cloud/usage/UsageManagerImpl.java
listAlerts: introduced new parameter "name" to the alertResponse
Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
Added new Admin API - generateAlert. Available to ROOT admin only
Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/BaseCmd.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
listAlerts: implemented search by alert name
Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	engine/schema/src/com/cloud/alert/AlertVO.java 
						
						
					 
					
						2013-12-04 10:05:46 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							426f564944 
							
						 
					 
					
						
						
							
							Resource metadata support for NetworkACLItem  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java 
						
						
					 
					
						2013-11-27 14:38:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7af387c894 
							
						 
					 
					
						
						
							
							Resource metadata support for NetworkACLList  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java 
						
						
					 
					
						2013-11-26 17:12:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5d974a234c 
							
						 
					 
					
						
						
							
							Resource metadata support for VPC Private Gateway  
						
						 
						
						
						
						
					 
					
						2013-11-26 12:48:15 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							b2f0a0bce2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4737: handling usage events for dynamic compute offering  
						
						 
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2013-11-26 17:07:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							cf69731a52 
							
						 
					 
					
						
						
							
							Suring startup load the API permissions from commands.properties and @APICommand annotations  
						
						 
						
						
						
						
					 
					
						2013-11-25 17:01:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							102331c62e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4959: added the connection and socket timeout parameters for SMTP and sending message in new thread so that HA doesn't get blocked beacause of hang in sending email alert  
						
						 
						
						
						
						
					 
					
						2013-11-25 15:52:33 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							602d4ef0cf 
							
						 
					 
					
						
						
							
							Resource metadata - support for VPC  
						
						 
						
						
						
						
					 
					
						2013-11-21 14:29:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							308b7a5c37 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1302: Allow cache_mode to be NULL in the database  
						
						 
						
						... 
						
						
						
						Not allowing this field to be NULL broke master due to the default
data which gets loaded into the database during initial startup of the
management server.
During generation of the XML for the VM it will however default to
'none' if NULL is passed 
						
						
					 
					
						2013-11-21 18:59:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							036fffcd7c 
							
						 
					 
					
						
						
							
							Add upgrade path from 4.3 to 4.4  
						
						 
						
						
						
						
					 
					
						2013-11-21 15:48:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							dc037b8d2f 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-1302: Add cache mode to SQL upgrade file"  
						
						 
						
						... 
						
						
						
						This reverts commit 7f1168cec74c704257f2d6040cd352b240d5d299. 
						
						
					 
					
						2013-11-21 15:09:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							7f1168cec7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1302: Add cache mode to SQL upgrade file  
						
						 
						
						... 
						
						
						
						This got lost in the previous commit
Not sure though if this is the right file, since this feature won't make it into
4.3, but there is no 4.4 file. 
						
						
					 
					
						2013-11-21 09:00:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							7ed030115e 
							
						 
					 
					
						
						
							
							Updated DB schema and DAO layer classes according to new FS.  
						
						 
						
						
						
						
					 
					
						2013-11-20 17:32:09 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							2d42b2d1ab 
							
						 
					 
					
						
						
							
							Add logs in case ipassoccmd failed  
						
						 
						
						
						
						
					 
					
						2013-11-20 15:07:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							90fb76a72c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5069. Added global config 'vmware.vcenter.session.timeout' to make the vCenter session timeout value configurable.  
						
						 
						
						
						
						
					 
					
						2013-11-20 16:12:22 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							a9413707c9 
							
						 
					 
					
						
						
							
							Fix listRouter by clusterId and upgradeRouterTemplate by clusterId  
						
						 
						
						
						
						
					 
					
						2013-11-18 13:05:34 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							1292b76c63 
							
						 
					 
					
						
						
							
							Add a new method on datastoredriver: getCapabilities, which will be called by liststoragepoolcmd. UI can make decision based on the capabilities of the storage.  
						
						 
						
						... 
						
						
						
						And also add a new table: snapshotdetails 
						
						
					 
					
						2013-11-14 15:55:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							4a8e9f8b8d 
							
						 
					 
					
						
						
							
							Resource Metadata: added implementation for Remote Access VPN  
						
						 
						
						
						
						
					 
					
						2013-11-13 14:26:16 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							04884b8f04 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5084: added missing global config vmware.hung.wokervm.timeout to the 4.2-4.2.1 upgrade path  
						
						 
						
						... 
						
						
						
						Conflicts:
	setup/db/db/schema-420to421.sql 
						
						
					 
					
						2013-11-11 16:32:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Grizzanti 
							
						 
					 
					
						
						
						
						
							
						
						
							dfb81ac127 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5080: Hypervisor Capabilities table missing entry for Simulator  
						
						 
						
						... 
						
						
						
						Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-11-11 12:11:28 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							8bd1eaa210 
							
						 
					 
					
						
						
							
							ResourceMetaData: added support for userIpAddress (publicIp) metadata  
						
						 
						
						
						
						
					 
					
						2013-11-08 10:48:43 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							19e9849d86 
							
						 
					 
					
						
						
							
							Enabled the traffic lable support the hyperv hypervisor type. Modified the physical_network_traffic_types table to introduce hyperv_network lable column.  
						
						 
						
						... 
						
						
						
						Modified associated VO's and impls classes. Modified the List/Update/Add TrafficType command api's and response classes.
Fixed the Unit tests 
						
						
					 
					
						2013-11-08 20:21:18 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							97348217c4 
							
						 
					 
					
						
						
							
							BUG-ID: CS-17753 unable to attach more than 5 data volumes to a VM running on ESX due to SCSI ID conflict between new volume and ID reserved for the virtual SCSI adapter  
						
						 
						
						... 
						
						
						
						Increasing the max data volumes limit in create-schema.sql  to 13 for vmware. 
						
						
					 
					
						2013-11-08 19:54:14 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Syed 
							
						 
					 
					
						
						
						
						
							
						
						
							0076307863 
							
						 
					 
					
						
						
							
							Squashed merge of Ssl Termination feature  
						
						 
						
						... 
						
						
						
						Bug: https://issues.apache.org/jira/browse/CLOUDSTACK-4821 
FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/SSL+Termination+Support 
This patch implements the SSL offload feature for loadbalancers
and includes the implementaion for this to work with Netscaler.
The following are the new API's that this patch adds
uploadSslCert
deleteSslCert
listSslCert
assignCertToLoadBalancer
removeCertFromLoadBalancer
Unit tests are also included in the patch. 
						
						
					 
					
						2013-11-08 16:49:16 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							416206595e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4736 Fixed issue in default service selection  
						
						 
						
						
						
						
					 
					
						2013-11-07 17:11:03 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							7095ea2b5e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4738 Dynamic compute offering.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2013-11-07 12:41:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							10c513a259 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)  
						
						 
						
						
						
						
					 
					
						2013-11-06 21:02:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							6c3038b66d 
							
						 
					 
					
						
						
							
							Add schema for policy.  
						
						 
						
						
						
						
					 
					
						2013-11-06 16:20:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							b464a20a52 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4736: Monitoring services in VR  
						
						 
						
						
						
						
					 
					
						2013-11-05 23:39:33 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							a286dec098 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4908: CPU socket count of host Adding cpu socket count of the host in hostresponse  
						
						 
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2013-11-05 16:12:36 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ce3638bb03 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2013-11-04 15:49:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2ff791b0b8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5025: volumes.display_volume field should be set to 1 by default. DB used to handle this, but VO was missing the default field assignment. Fixed th  
						
						 
						
						... 
						
						
						
						e VO and db upgrade to update all existing volumes with 1 value 
						
						
					 
					
						2013-11-01 22:48:11 -07:00