Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							e559573081 
							
						 
					 
					
						
						
							
							Revert "Disable VR UI quickview, due to technical limitations"  
						
						 
						
						... 
						
						
						
						This reverts commit 9dd650aca753dc41995ce1ef209371d275bc598b. 
						
						
					 
					
						2013-11-25 16:16:19 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							84be2ab3be 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4913: Don't enable ebtables/iptables for non-security group zone  
						
						 
						
						
						
						
					 
					
						2013-11-25 16:06:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							9dd650aca7 
							
						 
					 
					
						
						
							
							Disable VR UI quickview, due to technical limitations  
						
						 
						
						
						
						
					 
					
						2013-11-25 16:03:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c37e8b7e8c 
							
						 
					 
					
						
						
							
							Resource metadata - fixed the bug in removeResourceDetail API - when "key" parameter was passed in, used to remove the details matching the key, for all the resources, not just the one defined by resource_id  
						
						 
						
						
						
						
					 
					
						2013-11-25 15:32:52 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c15ec68210 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4793: UI > Virtual Routers > remove Advanced Search since we now have Select View (group by zone/pod/cluster).  
						
						 
						
						
						
						
					 
					
						2013-11-25 14:47:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3d5ff393da 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4793: UI > Virtual Routers > Select View > group by cluster > detailView > add pod name, zone name.  
						
						 
						
						
						
						
					 
					
						2013-11-25 14:33:04 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							7d4b298d2d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4793: UI > Virtual Routers > Select View > add "group by cluster".  
						
						 
						
						
						
						
					 
					
						2013-11-25 14:27:50 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							7819a4b7af 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4793: UI > Virtual Routers > Select View > add "group by pod".  
						
						 
						
						
						
						
					 
					
						2013-11-25 13:51:24 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							a1ca4f1d56 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5221:  
						
						 
						
						... 
						
						
						
						In order to keep backward compatibility, listisos should return an empty response than an error when id of a removed iso is passed. 
						
						
					 
					
						2013-11-25 13:47:42 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							5a9b4ee843 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4793: UI > Virtual Routers > Select View > group by zone > detailView > add action "upgrade all routers in this zone to use newer template".  
						
						 
						
						
						
						
					 
					
						2013-11-25 13:33:55 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							a5cff1dfd5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4793: UI > Virtual Routers > Select View > group by zone > implement detailView of Zone, Total of Virtual Routers, Virtual Routers require upgrade.  
						
						 
						
						
						
						
					 
					
						2013-11-25 12:08:55 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							eb21239e3f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5224: Add missing configuration for Netscaler, F5, SRX, and VNMC  
						
						 
						
						
						
						
					 
					
						2013-11-25 12:03:49 -07: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							29c36b2ad2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5122. [VMware] During upgrade from 4.1 system vms don't come up with 'ROOT-x-y VMDK file not found' exception.  
						
						 
						
						... 
						
						
						
						During VM start, if VM already exists and CS finds a matching disk in storage for each of the existing disk then the VM is reconfigured with VM's existing disk information. This existing disk information for a VM is got from vCenter.
CS checks if a matching disk exists in storage by checking if there is a disk in storage whose name atleast partially matches with the name of the existing disk.
Post 4.1, Volume path has been changed to ROOT-<instanceId> from ROOT-<instanceId>-<volumeId>. Hence in case of an upgraded setup (pre 4.1 to 4.2) during search for an existing disk in storage even though ROOT-<instanceId>-<volumeId> has been deleted, CS does a postive match of the old existing disk because of the partial match with the new disk ROOT-<instanceId> that exists in storage. And so when VM is being powered on by vCenter it looks for ROOT-<instanceId>-<volumeId> and fails to power on.
Solution - While looking for a VM's matching disk in storage, instead of checking if a disk with a partial match exists check if a disk with the exact name exists. 
						
						
					 
					
						2013-11-25 15:52:24 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							0be4a685e8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5164 Unmonit for 30 minutes for a failed process  
						
						 
						
						
						
						
					 
					
						2013-11-25 15:12:48 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Girish Shilamkar 
							
						 
					 
					
						
						
						
						
							
						
						
							ab2c38c050 
							
						 
					 
					
						
						
							
							Add test/integration/component/test_add_remove_network.py  
						
						 
						
						
						
						
					 
					
						2013-11-25 13:43:18 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							2ba27db0ce 
							
						 
					 
					
						
						
							
							CLOUDSTACK 2233: Automation test cases for Add Remove Networks to VM  
						
						 
						
						... 
						
						
						
						Signed-off-by: Girish Shilamkar <girish@clogeny.com> 
						
						
					 
					
						2013-11-25 13:15:49 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							6227ba6356 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5246:Xenserver - Hourly Snapshots - Creating snapshot from  
						
						 
						
						... 
						
						
						
						ROOT volume fails with NullPointer Exception due to new jobs framework
merge. 
						
						
					 
					
						2013-11-22 10:56:27 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fad0cfcc18 
							
						 
					 
					
						
						
							
							Added new paramerer "start" to createVPC command. When false is passed in, VPC won't be started (its VPC VR won't get implemented) till the point when the first netwotrk gets implemented in the VPC.  
						
						 
						
						... 
						
						
						
						The parameter is optional and true by default to preserve the original behavior
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java 
						
						
					 
					
						2013-11-22 09:39:54 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jijun 
							
						 
					 
					
						
						
						
						
							
						
						
							4517b9277b 
							
						 
					 
					
						
						
							
							rhel 6.x os mapping for vmware  
						
						 
						
						
						
						
					 
					
						2013-11-22 17:54:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yichi Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							8e580cc411 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5231: add helper messages for DynamicallyScalable and Routing  
						
						 
						
						
						
						
					 
					
						2013-11-22 17:15:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							386ee6bf34 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4793: UI > Virtual Routers > Select View > group by zone > listView of Zone, Total of Virtual Routers, Virtual Routers require upgrade.  
						
						 
						
						
						
						
					 
					
						2013-11-21 16:49:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							7b0cae6021 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4793: UI > Virtual Routers > add "Select View" dropdown on top of listView.  
						
						 
						
						
						
						
					 
					
						2013-11-21 16:04:00 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e8ec75a2b5 
							
						 
					 
					
						
						
							
							Removed unused agent lb timer  
						
						 
						
						
						
						
					 
					
						2013-11-21 14:29:40 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7df7abf327 
							
						 
					 
					
						
						
							
							Added missing @Inject to the ipAddressManager  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/user/AccountManagerImpl.java 
						
						
					 
					
						2013-11-21 14:29:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							602d4ef0cf 
							
						 
					 
					
						
						
							
							Resource metadata - support for VPC  
						
						 
						
						
						
						
					 
					
						2013-11-21 14:29:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							b4282c214f 
							
						 
					 
					
						
						
							
							System, main routers page: Split into subsections (WIP)  
						
						 
						
						
						
						
					 
					
						2013-11-21 13:56:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							285c06865c 
							
						 
					 
					
						
						
							
							List view: Support passing custom ID to detail view context  
						
						 
						
						... 
						
						
						
						For section select list views, if 'id' is specied under section: {},
then use that ID instead of the section's key ID. This allows sections
to use i.e. the same ID as each other for a consistent context ID. 
						
						
					 
					
						2013-11-21 13:56:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							b689e615c5 
							
						 
					 
					
						
						
							
							Bump the debian package version to 4.4.0-snapshot  
						
						 
						
						
						
						
					 
					
						2013-11-21 21:03:16 +01: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							de6bf7470c 
							
						 
					 
					
						
						
							
							One more merge conflict  
						
						 
						
						
						
						
					 
					
						2013-11-21 08:16:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							433a631916 
							
						 
					 
					
						
						
							
							Reformat of source code to set a stable base for the future.  I couldn't get checkstyle enabled.  There's still about a thousand errors from checkstyle.  Most of it from length errors from comments and strings.  Will attempt to remove those tonight.  This change is so large I just want to get it in before any merge nightmares.  The changes are fairly minor though and I did a full compile and start a server with the reformat code.  
						
						 
						
						
						
						
					 
					
						2013-11-21 07:56:47 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							3a414a850f 
							
						 
					 
					
						
						
							
							Add the upgrade path to all versions  
						
						 
						
						
						
						
					 
					
						2013-11-21 16:38:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							170f32f171 
							
						 
					 
					
						
						
							
							Broke up some long strings  
						
						 
						
						
						
						
					 
					
						2013-11-21 07:25:01 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							cf715ff491 
							
						 
					 
					
						
						
							
							Bump 4.3.0 to 4.4.0 in master  
						
						 
						
						
						
						
					 
					
						2013-11-21 16:01:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							036fffcd7c 
							
						 
					 
					
						
						
							
							Add upgrade path from 4.3 to 4.4  
						
						 
						
						
						
						
					 
					
						2013-11-21 15:48:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							d620df2bdd 
							
						 
					 
					
						
						
							
							Reformatted all of the code.  
						
						 
						
						
						
						
					 
					
						2013-11-21 06:15:26 -08: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							eaa250fd3c 
							
						 
					 
					
						
						
							
							Formatted again after all the tab expansions and eol removals  
						
						 
						
						
						
						
					 
					
						2013-11-21 04:47:01 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							224f479974 
							
						 
					 
					
						
						
							
							Removed trailing spaces  
						
						 
						
						
						
						
					 
					
						2013-11-21 04:08:01 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							e4b22d0fca 
							
						 
					 
					
						
						
							
							Replace all tabs, particularly the ones in the comments  
						
						 
						
						
						
						
					 
					
						2013-11-21 03:39:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							62e9273581 
							
						 
					 
					
						
						
							
							Removed trailing spaces  
						
						 
						
						
						
						
					 
					
						2013-11-21 03:12:05 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							0232906708 
							
						 
					 
					
						
						
							
							Brought in Hugo's checkstyle  
						
						 
						
						
						
						
					 
					
						2013-11-21 03:09:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							899e9f0d60 
							
						 
					 
					
						
						
							
							CS-16962: [API] [EIP/ELB enabled Zone] Need to display EIP address as  
						
						 
						
						... 
						
						
						
						"Public IP Address" for system VMs
In system VM response object return EIP as public IP in case of basic
zone with EIP service.
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java 
						
						
					 
					
						2013-11-21 15:20:28 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							8c6840e489 
							
						 
					 
					
						
						
							
							Modified GetExternalVirtSwitch to take the switchname param and return the same or default one  
						
						 
						
						
						
						
					 
					
						2013-11-21 14:36:47 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							6aafb9c50d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5227. Cannot pass Japanese characters as parameter values to an API.  
						
						 
						
						... 
						
						
						
						During API check for control characters use pattern matching to avoid identifying all non-printable characters as control characters. 
						
						
					 
					
						2013-11-21 13:40:06 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							4f1821bf3a 
							
						 
					 
					
						
						
							
							Add support of attaching nic's to the specified network labels in HyperV  
						
						 
						
						
						
						
					 
					
						2013-11-21 11:55:17 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gaurav Aradhye 
							
						 
					 
					
						
						
						
						
							
						
						
							138cee401f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5201: Correcting code related to schedule of  
						
						 
						
						... 
						
						
						
						recurring snapshot policy 
						
						
					 
					
						2013-11-21 11:15:32 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ashutosh K 
							
						 
					 
					
						
						
						
						
							
						
						
							db2ea0a16a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5204: test_routers - fixed ssh issue  
						
						 
						
						
						
						
					 
					
						2013-11-21 11:06:34 +05:30