Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							2f2efb0954 
							
						 
					 
					
						
						
							
							CS-19828: EC2 API tool errors while parsing response for detachVolume, describeAddress and revokeSecurityGroupIngress  
						
						... 
						
						
						
						Changes:
    - Set the mandatory response properties in case of DetachVolume and DescribeAddress API responses
    - Use the correct CS API responsename for revokesecuritygroupingress
Conflicts:
	awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java 
						
						
					 
					
						2014-07-16 14:28:11 -07:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							5b37c65577 
							
						 
					 
					
						
						
							
							oversimplified test fixed  
						
						
						
						
					 
					
						2014-07-16 17:28:01 +02:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							b0d7e10aef 
							
						 
					 
					
						
						
							
							Prevent a NPE when shutting down a network that did not have a vlan  
						
						... 
						
						
						
						assigned yet. 
						
						
					 
					
						2014-07-16 16:57:12 +02:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							cc37eb50cf 
							
						 
					 
					
						
						
							
							checkstyle: unused imports  
						
						
						
						
					 
					
						2014-07-16 16:52:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							799258662c 
							
						 
					 
					
						
						
							
							rvr4vpc simple test for deployRouter  
						
						
						
						
					 
					
						2014-07-16 16:44:28 +02:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							e78bb1d225 
							
						 
					 
					
						
						
							
							Switch the catch to Throwable. Uncaught exceptions in a scheduled  
						
						... 
						
						
						
						threadpool executor will not report or log uncaught exceptions but will
kill the thread causing unexplained timeouts in CS. 
						
						
					 
					
						2014-07-16 16:24:55 +02:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							dbc7d80329 
							
						 
					 
					
						
						
							
							Aggregate command cleanup is not required for the virtual router as we  
						
						... 
						
						
						
						already cleanup in the finish.
And consequently dies if somebody tries to test with assertions enabled. 
						
						
					 
					
						2014-07-16 16:24:54 +02:00 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							56e37243b8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7114. [EC2 QueryAPI] Inconsistency in mapping the "Allocated" state of a Volume to "Available".  
						
						
						
						
					 
					
						2014-07-16 15:22:40 +05:30 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							5ccd904e83 
							
						 
					 
					
						
						
							
							simple first test for backward compatibility testing in rvr4vpc work  
						
						
						
						
					 
					
						2014-07-16 10:59:58 +02:00 
						 
				 
			
				
					
						
							
							
								sanjeevneelarapu 
							
						 
					 
					
						
						
						
						
							
						
						
							dfee7b1456 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6992 Test data was passed to test methods.Made code changes to get test data and pass it to test methods. Also reading portable ip config values was not proper in getPortableIpRangeServices method. So corrected it  
						
						... 
						
						
						
						CLOUDSTACK-6992: Incorporated review comments for patch request 23009
CLOUDSTACK-6992: Added portable ip range to services class
Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> 
						
						
					 
					
						2014-07-16 13:05:56 +05:30 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							854f6ce3ee 
							
						 
					 
					
						
						
							
							UI > network > Edit Network action > not pass networkdomain parameter to updateNetwork API when input field is empty.  
						
						
						
						
					 
					
						2014-07-15 16:19:23 -07:00 
						 
				 
			
				
					
						
							
							
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							9b2565dcca 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6710: Add missing OS mappings  
						
						
						
						
					 
					
						2014-07-15 15:43:11 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							b58371e520 
							
						 
					 
					
						
						
							
							List view: Fix action pre-filter for multiselect actions  
						
						... 
						
						
						
						Evaluates pre-filter for individual actions (i.e., when action.preFilter is specified)
every time a multi-select row is checked orunchecked. This allows multi-select
actions to be shown/hidden on a per-row basis. 
						
						
					 
					
						2014-07-15 13:30:56 -07:00 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							733102c742 
							
						 
					 
					
						
						
							
							change XS log file name from vmops.log to cloud.log  
						
						
						
						
					 
					
						2014-07-15 11:07:15 -07:00 
						 
				 
			
				
					
						
							
							
								Joris van Lieshout 
							
						 
					 
					
						
						
						
						
							
						
						
							e8c32c7f5b 
							
						 
					 
					
						
						
							
							Disable inband management of openvswitch on the link local network. You don't want instances connected to this network to be able to talk to the openvswitch management interface.  
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-07-15 13:35:02 +02:00 
						 
				 
			
				
					
						
							
							
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							aacf8ef77b 
							
						 
					 
					
						
						
							
							Findbugs fixes in cloud-utils project and a few other places  
						
						
						
						
					 
					
						2014-07-15 14:23:17 +05:30 
						 
				 
			
				
					
						
							
							
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							33d6bc278f 
							
						 
					 
					
						
						
							
							Adding missing modified file  
						
						
						
						
					 
					
						2014-07-14 17:42:27 -07:00 
						 
				 
			
				
					
						
							
							
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							3d8dd1c921 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://git-wip-us.apache.org/repos/asf/cloudstack  
						
						
						
						
					 
					
						2014-07-14 17:30:12 -07:00 
						 
				 
			
				
					
						
							
							
								Amogh Vasekar 
							
						 
					 
					
						
						
						
						
							
						
						
							c30821f703 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6671: Missing patch in master  
						
						
						
						
					 
					
						2014-07-14 17:00:08 -07:00 
						 
				 
			
				
					
						
							
							
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							62e63a1bf7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6358: Missing patches in master for VMware  
						
						
						
						
					 
					
						2014-07-14 16:54:10 -07:00 
						 
				 
			
				
					
						
							
							
								Amogh Vasekar 
							
						 
					 
					
						
						
						
						
							
						
						
							09069fcc87 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6358: Add missing patches in master for KVM  
						
						
						
						
					 
					
						2014-07-14 16:51:55 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							36e5cc2b6a 
							
						 
					 
					
						
						
							
							Fix for non-grouped detail view  
						
						... 
						
						
						
						Fix issue where non-grouped detail page (i.e., instances stats page)
doesn't load due to the fields being passed as an object, not an array. 
						
						
					 
					
						2014-07-14 15:49:07 -07:00 
						 
				 
			
				
					
						
							
							
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							6831ed4026 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6358: Missing patches in master branch  
						
						
						
						
					 
					
						2014-07-14 15:17:58 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							5143fe404b 
							
						 
					 
					
						
						
							
							When instance.name.flag is set to true, append user-supplied name with legacy prefix to VM name appears in vCenter.  
						
						
						
						
					 
					
						2014-07-14 14:53:51 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							4f0640dac4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6595: allow to expunge the vm when its in Error state, in addition to Expunging/Destroyed states  
						
						
						
						
					 
					
						2014-07-14 14:40:11 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							e1095b0110 
							
						 
					 
					
						
						
							
							revert the change made by commit: a600d840  
						
						
						
						
					 
					
						2014-07-14 14:10:16 -07:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							a49bb7e8e3 
							
						 
					 
					
						
						
							
							Cleanup licenses in core with com.mycila:license-maven-plugin:format  
						
						
						
						
					 
					
						2014-07-14 16:28:29 +02:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							109d129096 
							
						 
					 
					
						
						
							
							Enforce licenses and license format in cloud-core  
						
						
						
						
					 
					
						2014-07-14 16:28:29 +02:00 
						 
				 
			
				
					
						
							
							
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							778e04cb77 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7104: perform ipassoc for ip when network is implemented after the gc  
						
						
						
						
					 
					
						2014-07-14 19:50:36 +05:30 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							1ed554650c 
							
						 
					 
					
						
						
							
							One day i'll remember to put the licenses in right away.  
						
						
						
						
					 
					
						2014-07-14 16:04:29 +02:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							1ad1883b74 
							
						 
					 
					
						
						
							
							Add virtualbox support to cloud-early-config so we can use virtualbox for testing  
						
						
						
						
					 
					
						2014-07-14 15:34:14 +02:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							c12767908d 
							
						 
					 
					
						
						
							
							Refactor VirtualRoutingResource, put the ConfigItems in separate classes and create a separate ConfigHelper  
						
						
						
						
					 
					
						2014-07-14 15:32:31 +02:00 
						 
				 
			
				
					
						
							
							
								ynojima 
							
						 
					 
					
						
						
						
						
							
						
						
							e7392cdac6 
							
						 
					 
					
						
						
							
							Remove "--output" option from qemu-img info command call  
						
						... 
						
						
						
						since the option is not supported by qemu-img in CentOS 6.3 
						
						
					 
					
						2014-07-13 00:33:16 -06:00 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							388210c8f9 
							
						 
					 
					
						
						
							
							Add more logs for MS cluster manager  
						
						
						
						
					 
					
						2014-07-11 17:39:40 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							63b81995f6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7100: update global config - trim leading and trailing whitespaces before global config value update  
						
						
						
						
					 
					
						2014-07-11 16:02:51 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							a6b42fde55 
							
						 
					 
					
						
						
							
							Corrected API doc description for listProjectInvitations/deleteProjectInvitation commands  
						
						
						
						
					 
					
						2014-07-11 14:59:40 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7098367dc6 
							
						 
					 
					
						
						
							
							Fixed code causing warnings in ActionEventUtils  
						
						
						
						
					 
					
						2014-07-11 14:59:39 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							bfb28da9fc 
							
						 
					 
					
						
						
							
							Trim postfix appended to the disk name by vCenter after snapshot operation when we are locating disk chain by name  
						
						
						
						
					 
					
						2014-07-11 14:42:46 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							87effa40ea 
							
						 
					 
					
						
						
							
							UI > IP Address > hide EnableVPN option on acquired IP.  
						
						
						
						
					 
					
						2014-07-11 13:46:29 -07:00 
						 
				 
			
				
					
						
							
							
								santhosh 
							
						 
					 
					
						
						
						
						
							
						
						
							aab6e1222f 
							
						 
					 
					
						
						
							
							Fixed Regression issues mentioned under CLOUDSTACK-6708  
						
						... 
						
						
						
						Signed-off-by: santhosh <santhosh.edukulla@gmail.com>
Conflicts:
	test/integration/smoke/test_deploy_vm.py
	test/integration/smoke/test_network.py
	test/integration/smoke/test_routers.py
	test/integration/smoke/test_vm_life_cycle.py 
						
						
					 
					
						2014-07-11 20:49:00 +05:30 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							00778de96e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7099. Volume snapshot is not getting backed up.  
						
						... 
						
						
						
						Correctly inject ConfigDao into SnapshotStateListener. 
						
						
					 
					
						2014-07-11 17:06:15 +05:30 
						 
				 
			
				
					
						
							
							
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							ba38981933 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7062: Enabled back the test as not able to repro  
						
						
						
						
					 
					
						2014-07-11 17:04:36 +05:30 
						 
				 
			
				
					
						
							
							
								Vania Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							8bd9e78071 
							
						 
					 
					
						
						
							
							Adding SolidFire API plug-in  
						
						
						
						
					 
					
						2014-07-10 21:22:47 -06:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							ab8036b766 
							
						 
					 
					
						
						
							
							List view: View subselect on infinite scrolling  
						
						... 
						
						
						
						Fixes issue where outdated context is passed to subselect's data provider
when infinite scroll event loads more data items. Now, context is derived
from DOM data directly instead of in the args. 
						
						
					 
					
						2014-07-10 16:43:31 -07:00 
						 
				 
			
				
					
						
							
							
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							1f3d02b38a 
							
						 
					 
					
						
						
							
							Reverting the changes done to this file for coverity fixes  
						
						
						
						
					 
					
						2014-07-10 23:35:27 +05:30 
						 
				 
			
				
					
						
							
							
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							394be902eb 
							
						 
					 
					
						
						
							
							Some findbugs fixes in cloud-api project  
						
						
						
						
					 
					
						2014-07-10 16:51:28 +05:30 
						 
				 
			
				
					
						
							
							
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							e0d4af5062 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7092: Disabled icmp redirects in VR  
						
						
						
						
					 
					
						2014-07-10 15:17:50 +05:30 
						 
				 
			
				
					
						
							
							
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							61fe959bb4 
							
						 
					 
					
						
						
							
							Removed invalid assertions from code. Now the MS can be run with assertions enabled (using -ea flag)  
						
						
						
						
					 
					
						2014-07-10 12:18:29 +05:30 
						 
				 
			
				
					
						
							
							
								Sujaya Maiyya 
							
						 
					 
					
						
						
						
						
							
						
						
							e07d0ddabf 
							
						 
					 
					
						
						
							
							fixed CLOUDSTACK-6261: remove the forceful timeout setting when login to NetScaler.  
						
						
						
						
					 
					
						2014-07-09 22:08:14 +05:30 
						 
				 
			
				
					
						
							
							
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							d51e8f44ae 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7079: Fixed the issue where rollback was called after commit. As well, added few null checks  
						
						
						
						
					 
					
						2014-07-09 15:58:43 +05:30