Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							811c904fc3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-537: cloudstack UI - Advanced SG-Enabled zone - zone wizard - network offering dropdown - populate only network offerings that include SecurityGroup service.  
						
						
						
						
					 
					
						2012-11-26 13:06:30 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							7d89d928d9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-537: cloudstack UI - Advanced SG-Enabled zone - zone wizard - physical network step - remove public traffic from droppable container.  
						
						
						
						
					 
					
						2012-11-26 12:45:47 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							759d434ba3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-537: cloudstack UI - Advanced SG-Enabled zone - zone wizard - hide public traffic step.  
						
						
						
						
					 
					
						2012-11-26 11:59:52 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f97f9631d8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-537: cloudstack UI - Advanced SG-Enabled zone - zone wizard - skip configuring public traffic type.  
						
						
						
						
					 
					
						2012-11-26 11:57:55 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							36d175126d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-537: cloudstack UI - zone wizard - (1) Advanced SG-Enabled zone: enable VirtualRouter and SecurityGroup provider. (2) Advanced SG-Disabled zone: enable VirtualRouter and VpcVirtualRouter provider.  
						
						
						
						
					 
					
						2012-11-26 11:55:41 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							d9ac544b06 
							
						 
					 
					
						
						
							
							CLOUDSTACK-537: cloudstack UI - zone wizard - create default guest network - Only pass gateway/netmask/startIp/endIp/VlanId to CreateNetwork API if it's an Advanced zone with SG. Do not pass them to CreateNetwork API if it's a Basic zone.  
						
						
						
						
					 
					
						2012-11-26 11:23:48 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e5ced5e4f4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-537: cloudstack UI - zone wizard - Advanced zone with SG enabled - show Guest Traffic step with 5 fields (gateway, netmask, startIp, endIp, VLAN ID) and pass them to CreateNetwork API when creating default guest network.  
						
						
						
						
					 
					
						2012-11-26 11:18:49 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e88ca00eb4 
							
						 
					 
					
						
						
							
							CS-15687: cloudstack 3.0 UI - zone wizard - change timer setting for adding netcaler provider.  
						
						
						
						
					 
					
						2012-11-16 10:57:00 +05:30 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							bcd60dab09 
							
						 
					 
					
						
						
							
							CLOUDSTACK-496: cloudstack UI - zone wizard - replace Isolation mode VLAN/SecurityGroup radio buttons with one single checkbox SecurityGroup.  
						
						
						
						
					 
					
						2012-11-15 15:52:28 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							9d7f48c40d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-485: cloudstack UI - zone wizard - Hide Guest Traffic Step(VLAN Range field) when Advanced/SecurityGroup is selected. Show it when Advanced/VLAN is selected.  
						
						
						
						
					 
					
						2012-11-14 14:43:04 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							60cec46333 
							
						 
					 
					
						
						
							
							CLOUDSTACK-484: cloudstack UI - zone wizard - Hide Guest CIDR field when Advanced/SecurityGroup is selected. Show it otherwise.  
						
						
						
						
					 
					
						2012-11-14 14:39:54 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							9f8d1e0048 
							
						 
					 
					
						
						
							
							CLOUDSTACK-477: cloudstack UI - zone wizard - When Advanced/SecurityGroup is selected, pass forVirtualNetwork=false to createVlanIpRange API.  
						
						
						
						
					 
					
						2012-11-13 16:59:48 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2f27746d71 
							
						 
					 
					
						
						
							
							CS-16802: cloudstack UI - Zone Wizard - add "Isolation Mode" (VLAN, Security Group) under advanced zone option.  
						
						
						
						
					 
					
						2012-11-13 10:19:36 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ac31b7d914 
							
						 
					 
					
						
						
							
							CS-15687: cloudstack 3.0 UI - zone wizard - change timer setting for adding netcaler provider.  
						
						
						
						
					 
					
						2012-10-01 13:26:59 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							b302ed904a 
							
						 
					 
					
						
						
							
							CS-16144: Show warning before enabling local storage in zone wizard  
						
						... 
						
						
						
						Conflicts:
	ui/dictionary.jsp 
						
						
					 
					
						2012-08-23 11:08:48 -07:00 
						 
				 
			
				
					
						
							
							
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							eb4e09ec58 
							
						 
					 
					
						
						
							
							CS-16048 Failled to assign VLAN to storage network in zoneWizard  
						
						
						
						
					 
					
						2012-08-22 18:06:03 +08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							ad2b8d7579 
							
						 
					 
					
						
						
							
							CS-16044: Zone wizard: Add 'use local storage' checkbox  
						
						... 
						
						
						
						Add checkbox to zone wizard indicating whether zone will use local
storage. If checked, bypass add primary storage step and enable local
storage for zone on creation.
Conflicts:
	ui/index.jsp 
						
						
					 
					
						2012-08-20 11:36:57 -07:00 
						 
				 
			
				
					
						
							
							
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							29459549ba 
							
						 
					 
					
						
						
							
							Fix a bug: zoneWizard uses incorrect vlan parameter to create storage network  
						
						
						
						
					 
					
						2012-08-14 13:43:09 +08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							b61468d65c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						... 
						
						
						
						Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java 
						
						
					 
					
						2012-08-11 18:27:18 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							263216caa5 
							
						 
					 
					
						
						
							
							Adds CLVM as an option for primary storage. It copies most of the RBD bits, in most cases simply adding an 'else if' or similar. In the managesnapshot.sh we add the ability to manipulate snapshots for the CLVM volumes, as well as a few minor fixes like adjusting the usage for the -b option to reflect that it accepts four arguments (note that it already accepted four args, it just wasn't reflected in the usage).  
						
						... 
						
						
						
						RB: https://reviews.apache.org/r/6470/ 
Send-by: shadowsor@gmail.com  
						
						
					 
					
						2012-08-10 13:33:06 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ce9f1afa78 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java 
						
						
					 
					
						2012-08-01 19:04:28 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							10cf9c2f20 
							
						 
					 
					
						
						
							
							CS-15687: cloudstack 3.0 UI - zone wizard - change timer setting for adding netcaler provider.  
						
						
						
						
					 
					
						2012-08-01 17:18:28 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7706a9c32f 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java 
						
						
					 
					
						2012-07-31 13:37:28 -07:00 
						 
				 
			
				
					
						
							
							
								olgasmola 
							
						 
					 
					
						
						
						
						
							
						
						
							05c9e0bb36 
							
						 
					 
					
						
						
							
							CS-15770: Hide Dedicated option when Basic EIP/ELB is chosen as Network Offering.  
						
						
						
						
					 
					
						2012-07-31 13:35:41 +03:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							254c05813c 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC - add zone wizard - enable VpcVirtualRouter element, enable VpcVirtualRouter provider for advanced zone.  
						
						
						
						
					 
					
						2012-07-20 15:49:13 -07:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							9687520712 
							
						 
					 
					
						
						
							
							applying Chip Childer's patches for license headers in the ui directory  
						
						
						
						
					 
					
						2012-06-26 10:46:53 -04:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							a00c21686f 
							
						 
					 
					
						
						
							
							(1) CS-15057: Remove jquery.timer.js from source code. Replace it with native JavaScript functions.  
						
						... 
						
						
						
						(2) CS-14604: cloudstack 3.0 UI - Add Zone Wizard - skip Guest Traffic step if OVS tunnel manager is enabled.
(3) CS-15311: cloudstack 3.0 UI - Add Zone Wizard - add physical network step - no isolation method dropdown if network type is Basic.
(4) CS-14769:  Don't pass subdomainaccess param when scope=project.
(5) CS-15157: cloudstack 3.0 UI - infrastructure page - physical network - network service providers - reset nspMap before populating listNetworkServiceProviders response to nspMap. 
						
						
					 
					
						2012-06-21 12:13:41 -07:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							52c8feb670 
							
						 
					 
					
						
						
							
							CS-15202: Rename all references in UI of Nexus VSM/dvswitch to Nexus 1000v  
						
						
						
						
					 
					
						2012-06-13 11:24:09 -07:00 
						 
				 
			
				
					
						
							
							
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							28b0df590e 
							
						 
					 
					
						
						
							
							CS-15078:Standard name for vSwitch  
						
						
						
						
					 
					
						2012-05-25 00:00:37 +05:30 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							6f0fc82fff 
							
						 
					 
					
						
						
							
							CS-15067  
						
						... 
						
						
						
						Provide Nexus vSwitch fields on add cluster form, if on VMware
hypervisor and vSwitch is enabled in configuration 
						
						
					 
					
						2012-05-23 13:09:50 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							bafc3f2a5a 
							
						 
					 
					
						
						
							
							CS-14521  
						
						... 
						
						
						
						Remove CLVM, due to license issue 
						
						
					 
					
						2012-05-15 15:13:15 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							63f1385fdd 
							
						 
					 
					
						
						
							
							CS-14717  
						
						... 
						
						
						
						Hide public traffic subnav when in basic zone configuration and not in
EIP/ELB 
						
						
					 
					
						2012-05-14 15:49:59 -07:00 
						 
				 
			
				
					
						
							
							
								bfederle 
							
						 
					 
					
						
						
						
						
							
						
						
							20e8481160 
							
						 
					 
					
						
						
							
							CS-14679  
						
						... 
						
						
						
						Fix label on primary storage required 'path' field 
						
						
					 
					
						2012-05-10 14:22:07 -07:00 
						 
				 
			
				
					
						
							
							
								bfederle 
							
						 
					 
					
						
						
						
						
							
						
						
							3f6e8d7ef7 
							
						 
					 
					
						
						
							
							Fix BG for setup guest traffic form in basic zone  
						
						
						
						
					 
					
						2012-05-04 09:59:03 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8d92440ec2 
							
						 
					 
					
						
						
							
							CS-14272: cloudstack 3.0 UI - Add Zone Wizard - physical networks step - add Isolation Method dropdown.  
						
						
						
						
					 
					
						2012-04-26 16:19:46 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8e3fc39b67 
							
						 
					 
					
						
						
							
							CS-12407: cloudstack 3.0 UI - Add F5 device - when Dedicated checkbox is checked, hide Capacity field and pass "capacity=1" to API.  
						
						
						
						
					 
					
						2012-04-24 10:56:29 -07:00 
						 
				 
			
				
					
						
							
							
								Salvatore Orlando 
							
						 
					 
					
						
						
						
						
							
						
						
							b8889eeb58 
							
						 
					 
					
						
						
							
							Fixing further issue with conflict resolution  
						
						
						
						
					 
					
						2012-04-23 22:35:15 +01:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							28218e6cfb 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - replace old sanitizeXSS() with new cloudStack.sanitize().  
						
						
						
						
					 
					
						2012-04-23 22:33:18 +01:00 
						 
				 
			
				
					
						
							
							
								bfederle 
							
						 
					 
					
						
						
						
						
							
						
						
							e23b2ac1fd 
							
						 
					 
					
						
						
							
							Zone wizard UI: fix selects  
						
						... 
						
						
						
						Fix selects being populated twice, due to combination of async calls
and non-async operations when re-selecting options in setup zone step. 
						
						
					 
					
						2012-04-20 16:05:57 -07:00 
						 
				 
			
				
					
						
							
							
								bfederle 
							
						 
					 
					
						
						
						
						
							
						
						
							e3bb5435f4 
							
						 
					 
					
						
						
							
							Zone wizard UI  
						
						... 
						
						
						
						Move network offerings array to local select fn scope, as it is only used there 
						
						
					 
					
						2012-04-20 16:04:59 -07:00 
						 
				 
			
				
					
						
							
							
								bfederle 
							
						 
					 
					
						
						
						
						
							
						
						
							9e2167041b 
							
						 
					 
					
						
						
							
							Zone wizard UI  
						
						... 
						
						
						
						Add missing 'selectedNetworkOfferingObj' var, which may cause JS
errors in some cases 
						
						
					 
					
						2012-04-20 14:58:08 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e852857f9e 
							
						 
					 
					
						
						
							
							bug 14516: add zone wizard - exclude EIP, ELB, SG network offerings only when hypervisor is VMware or BareMetal.  
						
						
						
						
					 
					
						2012-04-17 11:06:05 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							172ea6f109 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - add zone wizard - step 2 - fix a bug that change event of network offerings dropdown was not triggered when visiting step 2 the first time.  
						
						
						
						
					 
					
						2012-04-12 16:25:56 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							60d45ec5e3 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - fix a JS error "selectedNetworkOfferingObj is not defined"  
						
						
						
						
					 
					
						2012-04-12 16:25:38 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							b3bf6f08e6 
							
						 
					 
					
						
						
							
							bug 14386: cloudstack 3.0 UI - add zone wizard - basic zone - network offering dropdown - exclude network offerings having EIP/ELB/SG if hypervisor is not XenServer.  
						
						
						
						
					 
					
						2012-04-12 16:25:10 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							db25ef518b 
							
						 
					 
					
						
						
							
							bug CS-14441: Fix typo in VMware traffic label ID  
						
						
						
						
					 
					
						2012-04-12 12:17:52 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							ccdca396d3 
							
						 
					 
					
						
						
							
							bug 14603  
						
						... 
						
						
						
						-Disable display of public traffic icon for basic zone, non-EIP/ELB
-Show public traffic icon as 'required' for basic zone in EIP/ELB 
						
						
					 
					
						2012-04-04 14:52:38 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2f634c0913 
							
						 
					 
					
						
						
							
							Switch to Apache license  
						
						
						
						
					 
					
						2012-04-03 04:50:05 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							3e2ca5a54f 
							
						 
					 
					
						
						
							
							bug 14519  
						
						... 
						
						
						
						Show separate message for basic zone setup physical network UI 
						
						
					 
					
						2012-03-28 15:01:43 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1adb426e58 
							
						 
					 
					
						
						
							
							bug 13313: cloudstack 3.0 UI - Add Zone wizard - Skip addHost step when cluster dropdown is selected as VMWare in AddZone step.  
						
						
						
						
					 
					
						2012-03-28 13:31:38 -07:00