Rene Diepstraten 
							
						 
					 
					
						
						
						
						
							
						
						
							cf73d5b858 
							
						 
					 
					
						
						
							
							Added logpath variable and replaced hardcoded path  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rene Diepstraten <mail@renediepstraten.nl> 
						
						
					 
					
						2013-07-18 12:31:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							5f373eb5c1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3606: adding the new os types from upgrade from 4.1  
						
						 
						
						
						
						
					 
					
						2013-07-18 15:45:26 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Duffy 
							
						 
					 
					
						
						
						
						
							
						
						
							cd11fbd3d8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3344: unescape value  
						
						 
						
						
						
						
					 
					
						2013-07-18 15:20:40 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rene Diepstraten 
							
						 
					 
					
						
						
						
						
							
						
						
							c85d41d46f 
							
						 
					 
					
						
						
							
							Corrected typos in logmessages  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rene Diepstraten <mail@renediepstraten.nl> 
						
						
					 
					
						2013-07-18 11:47:30 +02: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							e25cbd66d2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3168: Change in try_ssh function  
						
						 
						
						... 
						
						
						
						Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-07-18 15:06:22 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							8442e35a79 
							
						 
					 
					
						
						
							
							tearDownClass and not teardown  
						
						 
						
						... 
						
						
						
						Include the affinity group in the deletion/cleanup
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit af9a8de9019d2759fb121dfd0230b8cfbe1850ea) 
						
						
					 
					
						2013-07-18 15:05:57 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							c0de2c5857 
							
						 
					 
					
						
						
							
							Delete the affinity group by id and not name  
						
						 
						
						... 
						
						
						
						Adding some docstrings to the tests so the test runner reports them.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 296c2f6a7018cc6d6ee94262600b71847965cbfd) 
						
						
					 
					
						2013-07-18 15:05:57 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							c3a04b63a7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3619: Cleanup of volume is not required as gc takes care.  
						
						 
						
						... 
						
						
						
						We don't need to delete the volume resource as part of cleanup as the
storage gc is expected to cleanup orphaned volumes in deleted
accounts/projects.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 8bc3757e80d20575d1eeee530309ab61c02857d8) 
						
						
					 
					
						2013-07-18 15:05:56 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							e90ef2b4b5 
							
						 
					 
					
						
						
							
							remove the wait during cleanup  
						
						 
						
						... 
						
						
						
						Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-07-18 15:05:56 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							d52d2c8505 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3618: When project account does not exist, API now throws exception  
						
						 
						
						... 
						
						
						
						API call listprojectaccounts failed, and test case
test_projects.py:test_08_cleanup_after_project_delete failed due to
this
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 52fa8532bb2821f9b5472e713a905bc6b7f712b5) 
						
						
					 
					
						2013-07-18 15:05:56 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							b4662af0a9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3551: scaling up VM to service offering with 2gbram  
						
						 
						
						... 
						
						
						
						Fixed the type overflow of Ram value.
Signed off by : Nitin Mehta<nitin.mehta@citrix.com> 
						
						
					 
					
						2013-07-18 15:04:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sailajam 
							
						 
					 
					
						
						
						
						
							
						
						
							f5bd253b2b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3596: Domain ID missing to deploy VM request . Included Domain id  
						
						 
						
						
						
						
					 
					
						2013-07-18 13:52:04 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							47b9e8ae61 
							
						 
					 
					
						
						
							
							add iptables/ethtool/vconfig requirement on Agent in cloud.spec  
						
						 
						
						
						
						
					 
					
						2013-07-18 09:29:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ahuang 
							
						 
					 
					
						
						
						
						
							
						
						
							11971b5a58 
							
						 
					 
					
						
						
							
							Bring over from vmsync changes in utils package.  Simple changes.  New files are not being used yet in master  
						
						 
						
						
						
						
					 
					
						2013-07-17 18:29:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ahuang 
							
						 
					 
					
						
						
						
						
							
						
						
							52e6ef7eb8 
							
						 
					 
					
						
						
							
							Added exception in error log  
						
						 
						
						
						
						
					 
					
						2013-07-17 17:48:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							cb2a84241b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3513: [Automation] Failed to copy iso and template between  
						
						 
						
						... 
						
						
						
						zones. 
						
						
					 
					
						2013-07-17 17:31:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ahuang 
							
						 
					 
					
						
						
						
						
							
						
						
							1e3e131e14 
							
						 
					 
					
						
						
							
							Save the zone and pod  
						
						 
						
						
						
						
					 
					
						2013-07-17 17:14:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vijayendra Bhamidipati 
							
						 
					 
					
						
						
						
						
							
						
						
							d6cb95208b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3554: NPE while attaching VMWARE Tools ISO to the instance  
						
						 
						
						... 
						
						
						
						Description:
    Account for null imagestore for vmware-tools iso. 
						
						
					 
					
						2013-07-17 16:58:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c618caf102 
							
						 
					 
					
						
						
							
							fix localendpoint npe  
						
						 
						
						
						
						
					 
					
						2013-07-17 16:29:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ahuang 
							
						 
					 
					
						
						
						
						
							
						
						
							cb5ab37916 
							
						 
					 
					
						
						
							
							Fixed the account id  
						
						 
						
						
						
						
					 
					
						2013-07-17 16:21:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ahuang 
							
						 
					 
					
						
						
						
						
							
						
						
							ee4d067c12 
							
						 
					 
					
						
						
							
							Fixed a bunch of asserts  
						
						 
						
						
						
						
					 
					
						2013-07-17 16:20:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ahuang 
							
						 
					 
					
						
						
						
						
							
						
						
							541f9d7f9c 
							
						 
					 
					
						
						
							
							Changed allocate method to be virtual machine type agnostic  
						
						 
						
						
						
						
					 
					
						2013-07-17 15:58:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							76e79851a0 
							
						 
					 
					
						
						
							
							vhd-util check doesn't work for some corrupted vhd file, use vhd-util read instead  
						
						 
						
						
						
						
					 
					
						2013-07-17 15:01:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c0db80fa1d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3601:add s3.rrs.enabled config parameter in upgrade setup.  
						
						 
						
						
						
						
					 
					
						2013-07-17 14:07:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							b41ed8a3ec 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3475: Fix tier id not being passed to autoscale UI  
						
						 
						
						
						
						
					 
					
						2013-07-17 13:46:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							59788c1473 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3530 Runtime exception while creating Snapshot from volume (ROOT/DATA)  
						
						 
						
						... 
						
						
						
						Worker name is not being configured for CopyCommand.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2013-07-18 00:39:28 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							e8e207863c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3476:deleteDomain api should fail when release dedicated resource to that domain fails  
						
						 
						
						
						
						
					 
					
						2013-07-17 11:25:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							36c0224142 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3584: fixed security group related apis with the correct class reference for projectid parameter  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java 
						
						
					 
					
						2013-07-17 10:58:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							4bbaac2d28 
							
						 
					 
					
						
						
							
							fix NPE in localhostendpoint  
						
						 
						
						
						
						
					 
					
						2013-07-17 10:16:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rene Diepstraten 
							
						 
					 
					
						
						
						
						
							
						
						
							53e6a1c0fa 
							
						 
					 
					
						
						
							
							Removed unused script scripts/storage/qcow2/cleanupmyvms.sh  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rene Diepstraten <mail@renediepstraten.nl> 
						
						
					 
					
						2013-07-17 18:35:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rene Diepstraten 
							
						 
					 
					
						
						
						
						
							
						
						
							ffe7cfe076 
							
						 
					 
					
						
						
							
							Truncated trailing/double spaces  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rene Diepstraten <mail@renediepstraten.nl> 
						
						
					 
					
						2013-07-17 18:31:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							bfe76b44da 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1301: fixed issues and add fields descriptions for disk I/O throttling  
						
						 
						
						
						
						
					 
					
						2013-07-17 16:35:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							22cb5be8b6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3592: Fix project email reference.  
						
						 
						
						... 
						
						
						
						Emails belong to user's within accounts. Refer to the first user within
the account and use his email for account invites.
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-07-17 19:26:21 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Girish Shilamkar 
							
						 
					 
					
						
						
						
						
							
						
						
							234db0561f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3586: Fixed regression test cases for Affinity Groups  
						
						 
						
						... 
						
						
						
						Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-07-17 19:23:58 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ashutoshkelkar 
							
						 
					 
					
						
						
						
						
							
						
						
							9f9510be91 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2273: cleanup using user api client for domain admins  
						
						 
						
						... 
						
						
						
						Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-07-17 19:23:57 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sowmya Krishnan 
							
						 
					 
					
						
						
						
						
							
						
						
							cfd892fc3b 
							
						 
					 
					
						
						
							
							Fixes CLOUDSTACK-3582  
						
						 
						
						... 
						
						
						
						Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-07-17 19:23:57 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							2d6644d961 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2433 Enable rps and rfs in virtual router  
						
						 
						
						
						
						
					 
					
						2013-07-17 16:59:59 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							21b1c9449a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3376: NPE: resource count calculation from the account manager on account cleanup  
						
						 
						
						... 
						
						
						
						This issue is happing because of the steps the code follow to cleanup the account.
The cleanupAccount was deleting the entries from the resource_limit and
resource_count table and performing further cleaning afterwards. Ideally, deletion
of entries from resourceLimit and resourceCount should be the last step in
cleanupAccount process.
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-07-17 12:39:16 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SrikanteswaraRao Talluri 
							
						 
					 
					
						
						
						
						
							
						
						
							5fbec76c8a 
							
						 
					 
					
						
						
							
							Fixed arguments in the format string in the debug message.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-07-17 12:36:27 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SrikanteswaraRao Talluri 
							
						 
					 
					
						
						
						
						
							
						
						
							3a60e56529 
							
						 
					 
					
						
						
							
							change all instances of account.account to acccount.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-07-17 12:36:27 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sowmya Krishnan 
							
						 
					 
					
						
						
						
						
							
						
						
							2910f9058d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3582: Add sleep so Netscaler recognizes the service to be up  
						
						 
						
						... 
						
						
						
						Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-07-17 12:36:27 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								radhikap 
							
						 
					 
					
						
						
						
						
							
						
						
							4ac6ebb2db 
							
						 
					 
					
						
						
							
							CLOUDSTACK-809 minor changes to the UI strings  
						
						 
						
						
						
						
					 
					
						2013-07-17 12:22:11 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sowmya Krishnan 
							
						 
					 
					
						
						
						
						
							
						
						
							51b7f5de91 
							
						 
					 
					
						
						
							
							Fix typo netscaler_1 in TestAddMultipleNSDiffZone  
						
						 
						
						... 
						
						
						
						Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-07-17 12:14:11 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								radhikap 
							
						 
					 
					
						
						
						
						
							
						
						
							f50e26e153 
							
						 
					 
					
						
						
							
							edits  
						
						 
						
						
						
						
					 
					
						2013-07-17 11:35:53 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							954e197813 
							
						 
					 
					
						
						
							
							Cloudstack-2997: maxconn missing param  
						
						 
						
						
						
						
					 
					
						2013-07-17 10:06:11 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							6b549074fa 
							
						 
					 
					
						
						
							
							Cloudstack-3313 Cannot deploy vm in ipv6 network  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-07-17 10:06:11 +05:30