Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							923c65d7ce 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6744 > UI > zone wizard > baremetal hypervisor > support EIP ELB feature.  
						
						
						
						
					 
					
						2014-12-18 18:15:06 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							417239e440 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8047: UI > zone wizard > add primary storage step: (zone-wide-primary-storage) fix a bug that failed to get cluster's hypervisor value if previous step (e.g. add host step) has ever failed.  
						
						
						
						
					 
					
						2014-12-08 15:19:32 -08:00 
						 
				 
			
				
					
						
							
							
								Mihaela Stoica 
							
						 
					 
					
						
						
						
						
							
						
						
							a49e240958 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7645: Use the localization function _l() instead of dictionary directly  
						
						
						
						
					 
					
						2014-11-14 11:51:40 -08:00 
						 
				 
			
				
					
						
							
							
								Gabor Apati-Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							985168ab4b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7718: No Field Validations on Zone Form  
						
						
						
						
					 
					
						2014-10-28 14:22:51 -07:00 
						 
				 
			
				
					
						
							
							
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							4e1284147e 
							
						 
					 
					
						
						
							
							Fixed incorrect label issue.  
						
						... 
						
						
						
						Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com> 
						
						
					 
					
						2014-10-23 13:25:20 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3b704ac6f3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7681: UI > zone wizard > Advanced zone > hypervisor => do not support BareMetal  
						
						
						
						
					 
					
						2014-10-07 11:00:01 -07:00 
						 
				 
			
				
					
						
							
							
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							6a11d099cf 
							
						 
					 
					
						
						
							
							Fix Externalization of hard-coded label strings  
						
						... 
						
						
						
						-Split 'dictionary.jsp' into two files -> 'dictionary.jsp' and
'dictionary2.jsp' -- this is due to JSP file constraints as the
localization object is getting quite long
-Per change above, 'dictionary' object is now split into an additonal
'dictionary2' object, which is merged with the main dict object on page
load
-All new dictionary mappings should be added to 'dictionary2' now.
Signed-off-by: Brian Federle <brian.federle@citrix.com> 
						
						
					 
					
						2014-09-17 13:59:13 -07:00 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							94ab397904 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7429: Allow LXC hypervisor for advance zone with SG hypervisor dropdown  
						
						
						
						
					 
					
						2014-09-01 10:24:11 +05:30 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							bea73e511e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7454: UI > zone wizard > Hyper-V > primary storage/secondary storage > move SMB Domain field to be on top of SMB Username field.  
						
						
						
						
					 
					
						2014-08-28 16:19:53 -07:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							c79ab570b0 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6967: Initial OVM3 drop"  
						
						... 
						
						
						
						This reverts commit 8a485b9b59e4108e862022baf7477f768380b325. 
						
						
					 
					
						2014-06-24 10:24:01 +02:00 
						 
				 
			
				
					
						
							
							
								Funs 
							
						 
					 
					
						
						
						
						
							
						
						
							8a485b9b59 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6967: Initial OVM3 drop  
						
						... 
						
						
						
						Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit ed47763e2525a21fa4578d199492462d0fb1c7ef)
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
	plugins/pom.xml
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	ui/scripts/docs.js 
						
						
					 
					
						2014-06-23 12:39:10 +02:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							af8e83b410 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6744 > UI > zone wizard > baremetal hypervisor > support EIP ELB feature.  
						
						... 
						
						
						
						This reverts commit d36c731f795e3d709d830c58936accfadc4277d8. 
						
						
					 
					
						2014-05-27 11:41:11 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							d36c731f79 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6744 > UI > zone wizard > baremetal hypervisor > support EIP ELB feature.  
						
						
						
						
					 
					
						2014-05-21 17:22:15 -07:00 
						 
				 
			
				
					
						
							
							
								Chris Suich 
							
						 
					 
					
						
						
						
						
							
						
						
							8bca77580a 
							
						 
					 
					
						
						
							
							Fixed 'label.path' being displayed in zone wizard  
						
						... 
						
						
						
						CLOUDSTACK-6372 
						
						
					 
					
						2014-04-12 11:17:30 -04:00 
						 
				 
			
				
					
						
							
							
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							e3e452625e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6267: unblocking smb as zone wide primary storage for hyperv  
						
						... 
						
						
						
						Signed-off-by: Devdeep Singh <devdeep@gmail.com> 
						
						
					 
					
						2014-03-27 16:24:40 +05:30 
						 
				 
			
				
					
						
							
							
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							182c31899b 
							
						 
					 
					
						
						
							
							Externalized the hardcodedstrings from UI JAVASCRIPT files.  
						
						
						
						
					 
					
						2014-03-05 14:11:51 -08:00 
						 
				 
			
				
					
						
							
							
								Gabor Apati-Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							477902379e 
							
						 
					 
					
						
						
							
							Fix CLOUDSTACK-4563: Initial zone wizard UI label issue  
						
						
						
						
					 
					
						2014-03-03 10:19:03 -08:00 
						 
				 
			
				
					
						
							
							
								Niels de Vos 
							
						 
					 
					
						
						
						
						
							
						
						
							c02197ae86 
							
						 
					 
					
						
						
							
							Add Gluster to the list of protocols in the Management Server  
						
						... 
						
						
						
						Gluster can now be used for Primary Storage just like NFS. This change adds the
Gluster protocol to the Management Server:
    Infrastructure -> Primary Storage -> Add Primary Storage
And also add the option to create Primary Storage on Gluster when
following the 'Add Zone' wizard from:
    Infrastructure -> Zones -> Add Zone
Some screenshots and verification:
- http://blog.nixpanic.net/2013/12/using-gluster-as-primary-storage-in.html  
						
						
					 
					
						2014-02-25 12:08:46 +01:00 
						 
				 
			
				
					
						
							
							
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							306ffa0218 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6053: While adding a primary or secondary of type smb the password wasn't  
						
						... 
						
						
						
						encoded. This cause createStoragePool or addImageStore command to fail if special
characters were present. Updated the code to pass user, password and domain as part
of details while adding primary or secondary. Also made changes on server side to
handle it. 
						
						
					 
					
						2014-02-10 10:29:09 +05:30 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							34174bbcbb 
							
						 
					 
					
						
						
							
							Add missing strings for quiesce VM, SMB fields  
						
						
						
						
					 
					
						2013-12-18 13:10:15 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							28a4bfc559 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5412: UI > Add Secondary Storage > NFS Server field > change label from "NFS Server" to "Server" since this field is also shown when provider "SMB/CIFS" is elected.  
						
						
						
						
					 
					
						2013-12-10 16:07:15 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							fe83dd621b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5412: UI > Add Secondary Storage > provider dropdown > change option "SMB/cifs" to "SMB/CIFS".  
						
						
						
						
					 
					
						2013-12-09 16:53:02 -08:00 
						 
				 
			
				
					
						
							
							
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							32c55e6d0c 
							
						 
					 
					
						
						
							
							fix UI  
						
						
						
						
					 
					
						2013-12-09 23:33:15 +07:00 
						 
				 
			
				
					
						
							
							
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							d935d3865a 
							
						 
					 
					
						
						
							
							tuna  
						
						
						
						
					 
					
						2013-12-09 23:33:14 +07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							9a0de43334 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5139: UI > zone wizard > secondary storage step > providers dropdown - hardcode options instead of get them from listStorageProviders&type=image since not all of returned values are handled by UI (e.g. "NetApp" is not handled by UI).  
						
						
						
						
					 
					
						2013-12-04 15:02:29 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							9fc81f0b4d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-999: hyper-V: UI > zone wizard > Edit Traffic Type > send hypervnetworklabel to addTrafficType API.  
						
						
						
						
					 
					
						2013-11-14 12:56:59 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8ec1f3f8d0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-999: hyper-V: UI > Add Primary Storage > when hypervisor type of selected cluster is Hyperv, populate Protocol dropdown with only one option "SMB/cifs".  
						
						
						
						
					 
					
						2013-11-14 11:42:59 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							253da8f6ba 
							
						 
					 
					
						
						
							
							CLOUDSTACK-999: hyper-V: UI > zone wizard > Add Secondary Storage step > add "SMB/cifs" option in Provider dropdown >  When Provider is selected as SMB/cifs, show SMB username/password/domain fields and send their values into url parameter of addImageStore API.  
						
						
						
						
					 
					
						2013-11-13 15:01:59 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							5a12165db7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-999: hyper-V: UI > zone wizard > Add Primary Storage step > add option "SMB/cifs" in protocol dropdown >  When protocol is selected as SMB/cifs, show SMB username/password/domain fields and send their values into url parameter of createStoragePool API.  
						
						
						
						
					 
					
						2013-11-13 14:11:06 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							7646063735 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3803: Fix duplicate label causing validation error  
						
						
						
						
					 
					
						2013-10-08 15:48:19 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							df3ee9a92d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4128: UI > zone wizard > secondary storage step > provider "S3" > Create NFS staging is required for S3 at this moment. So, disallow user to uncheck "Create NFS Secondary Staging" checkbox when provider is "S3".  
						
						
						
						
					 
					
						2013-09-23 13:57:47 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							bc98bca7f2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4128: UI > zone wizard > secondary storage step > check if S3 secondary storage (region-wide) exists. If yes, (1)Provider dropdown has only one option "S3". (2)Name input field is loaded with the existing S3 secondary storage name and disabled. (3)Create NFS Secondary Staging Store checkbox is checked and disabled. (4)NFS Server field and Path field are required.  
						
						
						
						
					 
					
						2013-09-12 16:38:59 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							19341d66f4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4089: UI > zone wizard > hypervisor VMware > physical network > vmware_network_label: remove trailing comma if there is any.  
						
						
						
						
					 
					
						2013-08-28 16:38:43 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ca8580717c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4089: UI > zone wizard > hypervisor VMware > configure physical network > edit traffic type label > split "VMware Traffic Label" field into 3 fields: "vSwitch Name", "VLAN ID", "vSwitch Type".  
						
						
						
						
					 
					
						2013-08-26 14:28:43 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							84228c2c60 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3950: UI > set g_regionsecondaryenabled to true after adding region-wide secondary storage.  
						
						
						
						
					 
					
						2013-08-20 15:35:56 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							419e57b918 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4341: UI > zone wizard > call dedicateZone API right after createZone API returns success.  
						
						
						
						
					 
					
						2013-08-14 17:04:55 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3efd930739 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4266: UI > zone wizard > cluster step > make Nexus 1000v fields optional.  
						
						
						
						
					 
					
						2013-08-13 13:17:59 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							21b09fc556 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4127: UI > zone wizard > cluster step > not pass value in vSwitchPublicType, vSwitchPublicName, vSwitchGuestType, vSwitchGuestName field to addCluster API call since the 4 fields are hidden.  
						
						
						
						
					 
					
						2013-08-11 20:28:24 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8280bf14e6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3813: UI > change label from Cache Storage to Secondary Staging Store.  
						
						
						
						
					 
					
						2013-07-26 15:29:18 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							81b121bbe0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3818: Cache Storage API commands have been renamed. Here is related UI change.  
						
						
						
						
					 
					
						2013-07-26 14:46:08 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							11dce48855 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3789: UI - specify type when making API calls.  
						
						
						
						
					 
					
						2013-07-24 11:50:49 -07:00 
						 
				 
			
				
					
						
							
							
								Isaac Chiang 
							
						 
					 
					
						
						
						
						
							
						
						
							06d897498b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3700: The dedication process should be listed as a step through zone wizard  
						
						
						
						
					 
					
						2013-07-24 16:33:49 +08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6e0439a67c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3651: UI > zone wizard > add secondary storage step - change this step from required to optional, add blank option to Provider dropdown.  
						
						
						
						
					 
					
						2013-07-18 16:25:29 -07:00 
						 
				 
			
				
					
						
							
							
								Ian Duffy 
							
						 
					 
					
						
						
						
						
							
						
						
							ad69bc8da3 
							
						 
					 
					
						
						
							
							Format JS  
						
						
						
						
					 
					
						2013-07-18 12:34:20 -04:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0392b571f9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3461: zone wizard - add cluster step - when hypervisor is VMware, vCenter Username and vCenter Password are required (for firing addVmwareDc API).  
						
						
						
						
					 
					
						2013-07-15 11:33:18 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							6eeea70dad 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3461: Make vCenter user/password fields optional  
						
						
						
						
					 
					
						2013-07-11 11:14:06 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							72499abbb6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3429: UI > zone wizard > advanced sg-enabled > exclude Hyperv from hypervisor dropdown.  
						
						
						
						
					 
					
						2013-07-09 15:33:51 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							410dff9d89 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1676: UI > zone wizard > basic zone > pass securitygroupenabled=true if selected network offering includes security group service; pass securitygroupenabled=false if selected network offering does not include security group service.  
						
						
						
						
					 
					
						2013-07-03 17:05:00 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							041303cc67 
							
						 
					 
					
						
						
							
							Baremetal: Fix typo of BaremetaUserdataProvider  
						
						... 
						
						
						
						Should be "Baremetal" rather than "Baremeta" 
						
						
					 
					
						2013-06-21 09:48:25 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							9aec9c605c 
							
						 
					 
					
						
						
							
							merge to master  
						
						
						
						
					 
					
						2013-06-19 18:16:47 -07:00