Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							506f2a4b94 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3228: system vms are not comming up in zone with two cluster xen and kvm CLOUDSTACK-3631: Enhance System vm deployment retry mechanism  
						
						... 
						
						
						
						Signed off by : Nitin Mehta<nitin.mehta@citrix.com> 
						
						
					 
					
						2013-08-05 18:19:16 +05:30 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							151a7ee497 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3861 and CLOUDSTACK-3862: Deprecate old S3/Swift classes.  
						
						
						
						
					 
					
						2013-08-02 18:16:46 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8930cfa983 
							
						 
					 
					
						
						
							
							Switched over to use the new jobs framework  
						
						
						
						
					 
					
						2013-08-02 11:07:55 -07:00 
						 
				 
			
				
					
						
							
							
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							65370f31bc 
							
						 
					 
					
						
						
							
							upgrade to ASF 4.2 "cloud" Database Schema Inconsistencies on the Upgraded Setup - Table "volumes"  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-08-02 17:07:22 +05:30 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							0529da136f 
							
						 
					 
					
						
						
							
							upgrade: Add upgrade patch to 4.3.0  
						
						
						
						
					 
					
						2013-08-02 11:50:19 +02:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							2e0f11f15f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4002: [Upgrade][2.2.16 to 4.2] After upgrade creation of  
						
						... 
						
						
						
						volume from a snapshot which was existing before upgrade, fails with NPE 
						
						
					 
					
						2013-08-01 17:08:49 -07:00 
						 
				 
			
				
					
						
							
							
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							21f1b137cb 
							
						 
					 
					
						
						
							
							Cloudstack-3753 Multiple VLAN range API need to accept a list rather than "add" or "remove" per command  
						
						... 
						
						
						
						Reviewed-by: Alena Prokharchyk
Conflicts:
	server/test/com/cloud/network/MockNetworkManagerImpl.java 
						
						
					 
					
						2013-08-01 13:36:20 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							f444ce7f65 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4015: don't insert the fake template record when upgrade from 304 to 305  
						
						
						
						
					 
					
						2013-08-01 09:58:43 -07:00 
						 
				 
			
				
					
						
							
							
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							8225374138 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.3.0-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chipchilders@apache.org> 
						
						
					 
					
						2013-08-01 10:35:00 -04:00 
						 
				 
			
				
					
						
							
							
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							b9a2b07ceb 
							
						 
					 
					
						
						
							
							Fix for incorect capacity displayed at the dashboard.  
						
						
						
						
					 
					
						2013-08-01 12:31:07 +05:30 
						 
				 
			
				
					
						
							
							
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							51e4f597e0 
							
						 
					 
					
						
						
							
							fix CLOUDSTACK-3591 add usage recording for VM snapshots  
						
						... 
						
						
						
						Conflicts:
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
	setup/db/db/schema-410to420.sql 
						
						
					 
					
						2013-08-01 10:47:36 +08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2cacbeac2c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3974: 410-420 db upgrade - exclude is_inline field from the query when insert the entry for the F5 load balancer as this field was dropped as a part of 40-41 upgrade  
						
						
						
						
					 
					
						2013-07-31 13:33:52 -07:00 
						 
				 
			
				
					
						
							
							
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							c7a1dbb176 
							
						 
					 
					
						
						
							
							Cloudstack-2997 unable to update concurrent_conncetions feild in network_offerin.  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-07-31 15:31:42 +05:30 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							9939d09455 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3969: Upgrade failed from 3.0.3 to 4.2 in KVM host with error 4.2.0 KVM SystemVm template not found though systemvm-kvm-4.2 template is uploaded during 3.0.3 setup  
						
						... 
						
						
						
						This is due to mysql version conflict with '=' and 'LIKE'.
Changing to '=' while searching for new system template. 
						
						
					 
					
						2013-07-31 15:12:10 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							95fde83815 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3936: db upgrade - added upgrade path from CCP 2.2.15,2.2.16 to CS 4.2  
						
						
						
						
					 
					
						2013-07-30 10:53:23 -07:00 
						 
				 
			
				
					
						
							
							
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							ccec275e09 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3904 listHosts API fails in VMware setup when virtualmachineid parameter is passed  
						
						... 
						
						
						
						Changes:
- Pod and Cluster can be null, modified the query to append these only if non-null 
						
						
					 
					
						2013-07-29 15:51:44 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							d64c318f57 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3510  
						
						... 
						
						
						
						Persist the download url in the db for volume download.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
Conflicts:
	server/src/com/cloud/storage/VolumeManagerImpl.java 
						
						
					 
					
						2013-07-29 11:50:15 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							a4cea4ebf2 
							
						 
					 
					
						
						
							
							Removed schema from the dependency of many components  
						
						
						
						
					 
					
						2013-07-29 10:55:19 -07:00 
						 
				 
			
				
					
						
							
							
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							63fea5e94e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3877 Unable to Resize Volume (kvm, vmware)  
						
						
						
						
					 
					
						2013-07-29 18:50:41 +05:30 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							2f369973e2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3779: Support System vm scaling on VMWare  
						
						... 
						
						
						
						Marked the system template new system template as dynamicallyScalable
   - handled upgrade case
   - moved "dynamicallyScalable" flag to vm_instance table from user_vm_details to support dynamic scaling of system vm
Signed off by : Nitin Mehta<nitin.mehta@citrix.com> 
						
						
					 
					
						2013-07-29 15:25:07 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							8cac1e0443 
							
						 
					 
					
						
						
							
							DB upgrade: upgraded the bunch of db upgrade files with Apache license header  
						
						
						
						
					 
					
						2013-07-26 15:37:07 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f5e5b39c9b 
							
						 
					 
					
						
						
							
							Moved the DB layer code into framework-db and change only the necessary projects to refer to it.  Cut down on the dependencies introduced with all the code in utils.  
						
						
						
						
					 
					
						2013-07-26 15:02:10 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							199e861a51 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3856:[ZWPS] Template downloaded from ROOT volume is not seen  
						
						... 
						
						
						
						in the UI because of failure to get hypervisor_type for the ROOT volume
for zone-wide primary storage. 
						
						
					 
					
						2013-07-26 13:41:58 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							9aaa378b08 
							
						 
					 
					
						
						
							
							Moved ClusterManager into it's own package.  Removed the agent load balancing code.  
						
						
						
						
					 
					
						2013-07-25 19:00:26 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							6a916b9e82 
							
						 
					 
					
						
						
							
							DB upgrade: added db upgrade paths for CloudPlatform (Citrix) releases 303,304,305,306,307 to 4.2  
						
						
						
						
					 
					
						2013-07-25 16:39:16 -07:00 
						 
				 
			
				
					
						
							
							
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							08bbfbdc4a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3491 delete host resulting NPE; Exception caught while handling disconnect: java.lang.NullPointerException  
						
						... 
						
						
						
						Changes:
- During host deletion, host entry in databse gets removed prior to the disconnect task getting processed.
- This causes the disconnect task to get NPE while trying to do the host state transition 
						
						
					 
					
						2013-07-25 15:57:39 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							555211a080 
							
						 
					 
					
						
						
							
							Moved Configuration from api to utils and moved the package.  This was done by eclipse so I only ran the unit test to verify everything is fine  
						
						
						
						
					 
					
						2013-07-25 03:57:12 -07:00 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							b7a483608f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3735. Domain deletion fails even when the networks within the domain have been destroyed.  
						
						... 
						
						
						
						When a network is destroyed remove the corresponding network entry from domain_network_ref and account_network_ref table 
						
						
					 
					
						2013-07-24 20:03:51 +05:30 
						 
				 
			
				
					
						
							
							
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							135a2e66c5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2508: Template usage should report both physical and virtual sizes  
						
						
						
						
					 
					
						2013-07-24 18:17:09 +05:30 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							eff27e1f83 
							
						 
					 
					
						
						
							
							don't update VM state if the state doesn't really change. updating VM state increases the update count, which might cause real VM update fail  
						
						
						
						
					 
					
						2013-07-22 15:56:37 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							cd6853cc1a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-732 Add disk snapshot for KVM 6.3, add the flag in CS.  
						
						... 
						
						
						
						Signed-off-by: Edison Su <sudison@gmail.com>
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java 
						
						
					 
					
						2013-07-19 13:26:19 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							823c72552e 
							
						 
					 
					
						
						
							
							InternalLb: fixed creation for default network offering with internal lb support - public lb support should be disbaled on it  
						
						
						
						
					 
					
						2013-07-19 13:20:57 -07:00 
						 
				 
			
				
					
						
							
							
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							c202142a1e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3628: [Storage]Migration of data disk from Shared primary to shared/local primary storage is throwing NPE  
						
						... 
						
						
						
						'Long' value was getting passed to a parameter of type 'long' and in case of null was resulting in NPE 
						
						
					 
					
						2013-07-19 19:08:03 +05:30 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							539eb38908 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3492: [Regression]Update Resource Count for an account is updating the primary storage incorretly.  
						
						... 
						
						
						
						The issue is that while calculating the used primary storage size, the updateResourceCount
API is also calculating the disk size of virtual router VM, created for that account and
because of this, the API is returning the incorrect result. 
						
						
					 
					
						2013-07-19 16:04:10 +05:30 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							499b78bf09 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3601: Adding router.template.xen/vmware/kvm/lxc/hyperv parameters in upgrade setup  
						
						... 
						
						
						
						Signed-off-by: Jayapal <jayapal@apache.org> 
						
						
					 
					
						2013-07-19 14:40:13 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ca1f8a6632 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3612: fixed missing indexes in some cloud tables. In the bug those tables are addressed as table  #4 , table  #5 , and table  #6  
						
						... 
						
						
						
						Conflicts:
	setup/db/db/schema-410to420.sql 
						
						
					 
					
						2013-07-18 16:00:19 -07:00 
						 
				 
			
				
					
						
							
							
								Vijayendra Bhamidipati 
							
						 
					 
					
						
						
						
						
							
						
						
							dfa612d1fe 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3598: [Automation] NullPointerException observed while connecting agent  
						
						... 
						
						
						
						Description:
    Fixing an NPE when setting resource count. 
						
						
					 
					
						2013-07-18 08:55:57 -07:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							551fdd7df4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3605  
						
						... 
						
						
						
						Make the display_offering = true by default in the code.
Signed off by : nitin mehta<nitin.mehta@citrix.com> 
						
						
					 
					
						2013-07-18 15:12:29 +05:30 
						 
				 
			
				
					
						
							
							
								ahuang 
							
						 
					 
					
						
						
						
						
							
						
						
							ee4d067c12 
							
						 
					 
					
						
						
							
							Fixed a bunch of asserts  
						
						
						
						
					 
					
						2013-07-17 16:20:53 -07:00 
						 
				 
			
				
					
						
							
							
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							f76bf5b053 
							
						 
					 
					
						
						
							
							Cloudstack-2150 DB table entries of phisical network is not proper.Shows Duplicate entries Cloudstack-2980 Adding a VLAN range that overlaps with two existing ranges results in inconsistent DB entries  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-07-17 15:22:33 +05:30 
						 
				 
			
				
					
						
							
							
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							d73bb22802 
							
						 
					 
					
						
						
							
							Incorportaed the review changes Now dhcpservice IPs are removed when last vm from the subnet is removed. Rebased with master.  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-07-17 12:35:06 +05:30 
						 
				 
			
				
					
						
							
							
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							dd33abffbe 
							
						 
					 
					
						
						
							
							Cloudstack-2997 Make haproxy maxconn configurable  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-07-17 10:06:11 +05:30 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							86bbe211f2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-494: Loose the limition of same ip used by site-to-site vpn  
						
						... 
						
						
						
						Different account can have same remote side IP now. Of course the remote side need
to identify them and configured properly to handle it. 
						
						
					 
					
						2013-07-16 17:26:51 -07:00 
						 
				 
			
				
					
						
							
							
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							fa9ca72f36 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2155: Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.  
						
						... 
						
						
						
						Changes:
- Locking the group and save reservation mechanism done by DPM
- Added admin operation to cleanup VM reservations
- DPM will also cleanup VM reservations on startup 
						
						
					 
					
						2013-07-16 10:53:06 -07:00 
						 
				 
			
				
					
						
							
							
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							661088927d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2155 Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.  
						
						... 
						
						
						
						Changes to check if the destination found does not conflict with any vm reservation 
						
						
					 
					
						2013-07-16 10:53:02 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							2d30f42d0f 
							
						 
					 
					
						
						
							
							After upgrade to 4.2.0, restart of system vms and router vm fails with a  
						
						... 
						
						
						
						NPE. 
						
						
					 
					
						2013-07-15 15:37:08 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							8f4575e877 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3400: add swift support  
						
						
						
						
					 
					
						2013-07-13 02:07:15 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							0c1ae20e77 
							
						 
					 
					
						
						
							
							add inital swift support  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/test/com/cloud/resource/MockResourceManagerImpl.java 
						
						
					 
					
						2013-07-13 02:07:03 -07:00 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							aaaf168f5a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2757. When configs are added the value of the property 'category' is not persisted.  
						
						
						
						
					 
					
						2013-07-12 16:50:30 +05:30 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							5dd1a1dd8e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2987: Fixing dynamicallyScalable flag in register and update template API Previuos commit: 7b6b8d7a077478620232ea1ac4ec2304289e8661 This fix is due to some changes made by the merges after this commit.  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-07-12 15:19:25 +05:30