Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8da249e2a3 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - infrastructure - zone detail - network service providers - VPC Virtual Router - Instances tab - detailView - add ChangeService action.  
						
						 
						
						
						
						
					 
					
						2012-08-06 16:00:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1e69966f75 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - infrastructure - zone detail - network service providers - Virtual Router - Instances tab - exclude VPC Virtual Router here.  
						
						 
						
						
						
						
					 
					
						2012-08-06 15:59:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							648dcf0ccf 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - infrastructure - zone detail - network service providers - VPC Virtual Router - Instances tab - add Type to listView (System, VPC or Project).  
						
						 
						
						
						
						
					 
					
						2012-08-06 15:50:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							4908adb3a1 
							
						 
					 
					
						
						
							
							S2S VPN: CS-15852: Add vpninmask for VPN network usage  
						
						 
						
						
						
						
					 
					
						2012-08-06 15:32:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							6e7b4bc07b 
							
						 
					 
					
						
						
							
							S2S VPN: CS-15642: Re-initiate the VPN connections after router reboot  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java 
						
						
					 
					
						2012-08-06 15:32:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							84a1a311f9 
							
						 
					 
					
						
						
							
							S2S VPN: CS-15511: Add PFS support for VPN connection  
						
						 
						
						
						
						
					 
					
						2012-08-06 15:27:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a8cbba9e82 
							
						 
					 
					
						
						
							
							S2S VPN: CS-15820: Remove account information of vpn gateway and vpn connection  
						
						 
						
						... 
						
						
						
						The owner would be always same as VPC owner.
Conflicts:
	api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
	setup/db/db/schema-304to305.sql 
						
						
					 
					
						2012-08-06 15:21:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							70d704c786 
							
						 
					 
					
						
						
							
							S2S VPN: Allow name to be modified in updateCustomerGateway  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java 
						
						
					 
					
						2012-08-06 15:20:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1b5103c501 
							
						 
					 
					
						
						
							
							S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime  
						
						 
						
						
						
						
					 
					
						2012-08-06 15:19:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							469e180515 
							
						 
					 
					
						
						
							
							multiEdit: better handling for tag widget  
						
						 
						
						... 
						
						
						
						Place tagging widget in a separate action and dialog class; it is
indicated by a 'tag' icon for better clarity.
-- This removes the requirement to specify a dummy 'edit' action on
multi-rules; instead, the separate tag action will appear automatically
as long as 'tags' is specified under the multiEdit's properties.
Conflicts:
	client/WEB-INF/classes/resources/messages.properties
	ui/css/cloudstack3.css
	ui/index.jsp 
						
						
					 
					
						2012-08-06 14:15:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							feb2ed1d2d 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - site to site VPN - Edit mode - (1)split IKE policy field into 3 fields. (2)split ESP plicy field into 3 fields. (3)split lifetime field into 2 fields. (4) add Dead Peer Detection field.  
						
						 
						
						
						
						
					 
					
						2012-08-06 13:26:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							532806ba13 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - site to site VPN - listView - (1)split IKE policy field into 3 fields. (2)split ESP plicy field into 3 fields. (3)split lifetime field into 2 fields. (4) add Dead Peer Detection field.  
						
						 
						
						
						
						
					 
					
						2012-08-06 13:25:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8b16e32b50 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - site to site VPN - Create action - (1)split IKE policy field into 3 fields. (2)split ESP plicy field into 3 fields. (3)split lifetime field into 2 fields. (4) add Dead Peer Detection field.  
						
						 
						
						
						
						
					 
					
						2012-08-06 13:13:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							e149459358 
							
						 
					 
					
						
						
							
							VPC ACL UI: Fix alignment of multiEdit tables  
						
						 
						
						... 
						
						
						
						Conflicts:
	ui/css/cloudstack3.css 
						
						
					 
					
						2012-08-06 11:23:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							feaea413c7 
							
						 
					 
					
						
						
							
							CS-15844:InterVlan - UI - Remove ACL Icon is not displayed properly for ACL Rules  
						
						 
						
						
						
						
					 
					
						2012-08-06 16:06:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5a72044dc7 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						 
						
						
						
						
					 
					
						2012-08-03 14:30:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							237d91d4c9 
							
						 
					 
					
						
						
							
							Removed @author tags in some classes  
						
						 
						
						
						
						
					 
					
						2012-08-03 14:25:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							3496a73878 
							
						 
					 
					
						
						
							
							VPC: CS-15812 - fixed listVPCs by projectId  
						
						 
						
						
						
						
					 
					
						2012-08-03 14:23:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e7a1862867 
							
						 
					 
					
						
						
							
							VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/ha/UserVmDomRInvestigator.java 
						
						
					 
					
						2012-08-03 14:23:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							6eba8a818a 
							
						 
					 
					
						
						
							
							VPC: applyStaticRoutes - don't exclude static routes in Revoke state  
						
						 
						
						
						
						
					 
					
						2012-08-03 14:15:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							e9a7495952 
							
						 
					 
					
						
						
							
							remove vhd-tools directory  
						
						 
						
						
						
						
					 
					
						2012-08-03 13:33:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6aee5f2aef 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - site to site VPN - VPN customer gateway - implement Edit mode.  
						
						 
						
						... 
						
						
						
						Conflicts:
	ui/scripts/network.js 
						
						
					 
					
						2012-08-03 13:24:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							e8f10b74a8 
							
						 
					 
					
						
						
							
							Devcloud build process fixes.  
						
						 
						
						
						
						
					 
					
						2012-08-03 16:21:05 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							9697860938 
							
						 
					 
					
						
						
							
							CS-15842: VPC gateway create form: Put 'VLAN' field at the top  
						
						 
						
						
						
						
					 
					
						2012-08-03 12:29:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							26a4132b11 
							
						 
					 
					
						
						
							
							CS-15841: Better add VPC gateway flow  
						
						 
						
						... 
						
						
						
						- Because only 1 gateway can exist per VPC, remove 'add' button from
  list view and immediately show create form on click if no gateway is
  present; show list view on successful creation. If there is a
  gateway, go to list view immediately.
- Rename "Gateways" -> "Private Gateway" 
						
						
					 
					
						2012-08-03 12:26:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							75242b49ce 
							
						 
					 
					
						
						
							
							VPC details: Display 'restart required' field  
						
						 
						
						
						
						
					 
					
						2012-08-03 12:03:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							6f833d2414 
							
						 
					 
					
						
						
							
							License header updates for misc files  
						
						 
						
						
						
						
					 
					
						2012-08-03 14:51:41 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							5cb356024f 
							
						 
					 
					
						
						
							
							CS-15802: Add VPC filter to instance wizard network select  
						
						 
						
						... 
						
						
						
						Adds drop-down select to filter networks by VPC.
-If no VPC is selected, only show non-VPC isolated networks
-If VPC is selected, show tiers from specified VPC. Note that only one
 tier/network can be checked at a time in this mode, and 'add network'
 text field is hidden 
						
						
					 
					
						2012-08-03 11:42:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							a0e815df46 
							
						 
					 
					
						
						
							
							License header updates for the vmware-base folder  
						
						 
						
						
						
						
					 
					
						2012-08-03 14:36:43 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							46e6482fc0 
							
						 
					 
					
						
						
							
							License header updates for the top level folder  
						
						 
						
						
						
						
					 
					
						2012-08-03 14:33:32 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							95ce55f0a1 
							
						 
					 
					
						
						
							
							License header updates for the utils folder  
						
						 
						
						
						
						
					 
					
						2012-08-03 14:15:09 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							20b0790753 
							
						 
					 
					
						
						
							
							CS-15809: Show account/domain fields on VPC detail view  
						
						 
						
						... 
						
						
						
						Conflicts:
	ui/scripts/network.js 
						
						
					 
					
						2012-08-03 11:13:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							7fb1e13957 
							
						 
					 
					
						
						
							
							CS-15793: Fix static NAT select when in a VPC network  
						
						 
						
						... 
						
						
						
						Conflicts:
	ui/scripts/network.js 
						
						
					 
					
						2012-08-03 11:07:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							1ba95ec373 
							
						 
					 
					
						
						
							
							License header updates for the usage folder.  
						
						 
						
						
						
						
					 
					
						2012-08-03 13:45:22 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							7998362b18 
							
						 
					 
					
						
						
							
							License header updates for the UI folder  
						
						 
						
						
						
						
					 
					
						2012-08-03 12:45:47 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							703a4e8dd1 
							
						 
					 
					
						
						
							
							License header updates for the tools folder.  
						
						 
						
						
						
						
					 
					
						2012-08-03 12:06:56 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							58c5a3b6b3 
							
						 
					 
					
						
						
							
							Corrected URL params in build_vagrant_basebox.sh.  
						
						 
						
						
						
						
					 
					
						2012-08-03 11:08:04 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							ad79ee9f26 
							
						 
					 
					
						
						
							
							License header updates for the test folder.  
						
						 
						
						
						
						
					 
					
						2012-08-03 10:39:05 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							2930eef00c 
							
						 
					 
					
						
						
							
							License header updates for the setup folder.  
						
						 
						
						
						
						
					 
					
						2012-08-03 09:49:02 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							78764c8b6e 
							
						 
					 
					
						
						
							
							License header updates for the server folder.  
						
						 
						
						
						
						
					 
					
						2012-08-03 09:41:27 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							09bdd3b6c3 
							
						 
					 
					
						
						
							
							License header updates for the scripts folder.  
						
						 
						
						
						
						
					 
					
						2012-08-03 09:38:28 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							955d91e51b 
							
						 
					 
					
						
						
							
							License header updates for the python folder.  
						
						 
						
						
						
						
					 
					
						2012-08-03 09:27:08 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							3a882fa17c 
							
						 
					 
					
						
						
							
							License header updates for the plugins folder.  
						
						 
						
						
						
						
					 
					
						2012-08-03 09:07:43 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							3c68f1f8e8 
							
						 
					 
					
						
						
							
							bug CS-15200: Introducing state transition when volume is getting copied from secondary storage and it is put into Creating state  
						
						 
						
						... 
						
						
						
						Reviewed-by: Kishan 
						
						
					 
					
						2012-08-03 17:18:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							6fd6d797b2 
							
						 
					 
					
						
						
							
							Implementing Migration and Maintenance for simulator hosts [Part 2]  
						
						 
						
						
						
						
					 
					
						2012-08-03 15:56:12 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							87bcd8e116 
							
						 
					 
					
						
						
							
							Implementing Migration and Maintenance mode for the simulator  
						
						 
						
						
						
						
					 
					
						2012-08-03 15:55:01 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							20407ec863 
							
						 
					 
					
						
						
							
							CS-15793:Enable static NAT for the public IP address screen is not showing VMs  
						
						 
						
						
						
						
					 
					
						2012-08-03 15:54:10 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							9b43753399 
							
						 
					 
					
						
						
							
							VPC : handle Revoke rules for staticroute  
						
						 
						
						
						
						
					 
					
						2012-08-02 18:59:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							0c9d5f5eb1 
							
						 
					 
					
						
						
							
							VPC : typo  
						
						 
						
						
						
						
					 
					
						2012-08-02 18:59:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bda8fc1e0c 
							
						 
					 
					
						
						
							
							Fixed api doc  
						
						 
						
						
						
						
					 
					
						2012-08-02 18:49:42 -07:00