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 
						 
				 
			
				
					
						
							
							
								Tim Mackey 
							
						 
					 
					
						
						
						
						
							
						
						
							a8212d9ef4 
							
						 
					 
					
						
						
							
							Cleanup of Xen and XenServer terms. Cloned xen plugin creating a xenserver plugin, then removed xen plugin  
						
						... 
						
						
						
						Signed-off-by: Tim Mackey <tmackey@gmail.com>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com> 
						
						
					 
					
						2014-06-07 04:50:23 -04:00 
						 
				 
			
				
					
						
							
							
								Gabor Apati-Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							9fa9e3aaff 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6565: [UI] New Zones tab for Templates and ISOs  
						
						
						
						
					 
					
						2014-05-23 10:58:17 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							7ae8dc8fbd 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6565: [UI] New Zones tab for Templates and ISOs"  
						
						... 
						
						
						
						This reverts commit 348fb7bcb675f60d1a3c649a8c0af8404044642f. 
						
						
					 
					
						2014-05-12 12:26:37 -07:00 
						 
				 
			
				
					
						
							
							
								Gabor Apati-Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							348fb7bcb6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6565: [UI] New Zones tab for Templates and ISOs  
						
						
						
						
					 
					
						2014-05-12 11:40:24 -07:00 
						 
				 
			
				
					
						
							
							
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							24820d20d3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6288: Changing default ImageFormat to vhdx for hyper-v and allowing registration of vhdx format templates.  
						
						... 
						
						
						
						Signed-off-by: Devdeep Singh <devdeep@gmail.com> 
						
						
					 
					
						2014-04-01 14:00:24 +05:30 
						 
				 
			
				
					
						
							
							
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							182c31899b 
							
						 
					 
					
						
						
							
							Externalized the hardcodedstrings from UI JAVASCRIPT files.  
						
						
						
						
					 
					
						2014-03-05 14:11:51 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c93b0967ef 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6140: UI - template - detailView - move fields that are used more often to the top.  
						
						
						
						
					 
					
						2014-02-19 15:31:02 -08:00 
						 
				 
			
				
					
						
							
							
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							e171cb181c 
							
						 
					 
					
						
						
							
							Fixed-Hardcoding-Issues  
						
						
						
						
					 
					
						2014-02-14 07:44:54 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c1101eb695 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5606: UI > copy template, copy ISO action > when a template/ISO to be copied is not associated with a specific zone, UI does not pass sourcezoneid parameter to API.  
						
						
						
						
					 
					
						2013-12-30 14:52:27 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1e0ed7d5f8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5606: UI > Copy Template action, Copy ISO action is now availble to region-wide secondary storage (S3, Swift).  
						
						
						
						
					 
					
						2013-12-23 11:34:30 -08:00 
						 
				 
			
				
					
						
							
							
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							95364a4022 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5531  
						
						... 
						
						
						
						Initial support for vhd, raw, vmdk image formats on KVM. Tested all formats with local and CLVM. 
						
						
					 
					
						2013-12-16 14:32:51 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							4eaa681814 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5354: UI > update ISO > make isExtractable, isFeatured checkbox non-editable to normal user.  
						
						
						
						
					 
					
						2013-12-06 16:35:37 -08:00 
						 
				 
			
				
					
						
							
							
								Yichi Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							8e580cc411 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5231: add helper messages for DynamicallyScalable and Routing  
						
						
						
						
					 
					
						2013-11-22 17:15:59 +01:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6df1998645 
							
						 
					 
					
						
						
							
							UI > Edit Template, Edit ISO > can't update template/ISO in only one zone. It always get updated in all zones.  
						
						
						
						
					 
					
						2013-10-24 14:58:23 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							259245200d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4649: UI > Edit Instance, Edit Template > fix a bug that XenServer Tools Version 6.1+ field didn't get updated correctly.  
						
						
						
						
					 
					
						2013-10-24 14:25:21 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							9f38614eb8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-999: UI > Register Template > when hypervisor is selected as "Hyperv", format dropdown will have "VHD" option.  
						
						
						
						
					 
					
						2013-10-23 13:18:18 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							5133812c85 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4649: UI > (1) detailView widget: pass $detailView property in action.action({}).  
						
						... 
						
						
						
						(2) Edit Template action: make 'XenServer Tools Version 6.1+' field editable and use addResourceDetail API to update it.
(3) Edit Instance action: make 'XenServer Tools Version 6.1+' field editable and use addResourceDetail API to update it. 
						
						
					 
					
						2013-10-23 12:51:08 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c3ddd3bf00 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4649: UI > (1) Register Template dialog: add 'XenServer Tools Version 6.1+' checkbox.  
						
						... 
						
						
						
						(2) Template detailView: add 'XenServer Tools Version 6.1+' field.
(3) Instance detailView: add 'XenServer Tools Version 6.1+' field. 
						
						
					 
					
						2013-10-23 12:50:42 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							34c04a4546 
							
						 
					 
					
						
						
							
							UI code cleanup: Fix trailing commas in JS  
						
						
						
						
					 
					
						2013-09-24 11:16:13 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							160d980c72 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4709: UI > template > register template > when zone dropdown is selected as All Zones, show all hypervisors supported in cloudstack instead of only hypervisors available in all zones.  
						
						
						
						
					 
					
						2013-09-19 10:20:57 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							d96e599c7d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3950: UI > template/ISO page > hide copyTemplate/copyISO action when secondary storage is region-wide.  
						
						
						
						
					 
					
						2013-08-20 14:40:15 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							4bee74464f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3950: UI > template/ISO page > registerTemplate/registerISO action > zone dropdown > include only one option "All Zones" when secondary storage is region-wide.  
						
						
						
						
					 
					
						2013-08-20 14:25:13 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							4e132fccb6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3950: UI > template/ISO page > hide CopyTemplate/CopyISO action when it's region-wide (i.e. zoneid is null)  
						
						
						
						
					 
					
						2013-08-16 19:53:29 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							4ba4e8038a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4054: Fix conditional fields not showing on first load  
						
						
						
						
					 
					
						2013-08-07 16:24:21 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							4e3dc2622d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3531: Add isrouting checkbox to register template dialog  
						
						
						
						
					 
					
						2013-07-30 11:09:47 -07:00 
						 
				 
			
				
					
						
							
							
								Ian Duffy 
							
						 
					 
					
						
						
						
						
							
						
						
							ad69bc8da3 
							
						 
					 
					
						
						
							
							Format JS  
						
						
						
						
					 
					
						2013-07-18 12:34:20 -04:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8236e7b633 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2988: UI > templates menu > update template action - add Dynamically Scalable field.  
						
						
						
						
					 
					
						2013-07-10 14:15:33 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f7f826d4f5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2987: UI > Templates menu > register template action: add Dynamically Scalable field.  
						
						
						
						
					 
					
						2013-07-10 11:11:20 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							a03eeae59c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3341: UI > template/ISO page > downloadTemplate/downloadISO action - do not decode URL return in extractTemplate API response.  
						
						
						
						
					 
					
						2013-07-08 13:12:57 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							7e8d19963d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2842: UI - fix a JS error "elems is undefined" when popping up a dialog box that has zone dropdown and there is no zone created yet.  
						
						
						
						
					 
					
						2013-06-04 14:22:47 -07:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							c11dbad9c9 
							
						 
					 
					
						
						
							
							merge master  
						
						
						
						
					 
					
						2013-05-11 15:28:43 +05:30 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							dd62b3de7e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2038: cloudstack UI - mixed zone management - template menu - copy ISO action - populate zone dropdown upon selected zone type on top menu.  
						
						
						
						
					 
					
						2013-04-15 16:42:40 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6c2f2d3a9d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2038: cloudstack UI - mixed zone management - template menu - copy template action - populate zone dropdown upon selected zone type on top menu.  
						
						
						
						
					 
					
						2013-04-15 16:35:07 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							9e392d25ba 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2038: cloudstack UI - mixed zone management - template menu - register ISO action - populate zone dropdown upon selected zone type on top menu.  
						
						
						
						
					 
					
						2013-04-15 16:05:01 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2431c814a8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2038: cloudstack UI - mixed zone management - template menu - register template action - populate zone dropdown upon selected zone type on top menu.  
						
						
						
						
					 
					
						2013-04-15 15:57:37 -07:00 
						 
				 
			
				
					
						
							
							
								Phong Nguyen 
							
						 
					 
					
						
						
						
						
							
						
						
							aa79ccf985 
							
						 
					 
					
						
						
							
							CLOUDSTACK-922: LXC Support in Cloudstack.  
						
						... 
						
						
						
						Signed-off-by: Edison Su <sudison@gmail.com> 
						
						
					 
					
						2013-04-01 15:41:42 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							b70c1a5a84 
							
						 
					 
					
						
						
							
							Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones.  
						
						
						
						
					 
					
						2012-12-13 23:18:37 -08:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							5b7b47048b 
							
						 
					 
					
						
						
							
							Add missing tooltips  
						
						... 
						
						
						
						Add missing doc tooltips for the following dialogs:
-Add VPN customer gateway
-Add ISO
-Enter project token
-Add compute offering
-Add system offering
-Add network offering 
						
						
					 
					
						2012-12-07 13:19:37 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							163779200f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-544: cloudstack UI - template page, ISO page - edit, copy, download action is available if template/ISO and the login user is under the same project.  
						
						
						
						
					 
					
						2012-11-26 16:13:01 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							57aeb17a5f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-495: cloudstack UI - template page - delete template/ISO - fix a JS error "cloudStack.context.projects is null"  
						
						
						
						
					 
					
						2012-11-15 15:50:01 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							126b4b5790 
							
						 
					 
					
						
						
							
							CS-16483: cloudstack UI - template page, ISO page - delete action is available if template/ISO and the login user is under the same project.  
						
						
						
						
					 
					
						2012-11-05 16:34:07 -08:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1400f84a33 
							
						 
					 
					
						
						
							
							CS-16573: cloudstack UI - update ISO - encode data passed to API call.  
						
						
						
						
					 
					
						2012-10-25 11:05:53 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ef83621c5b 
							
						 
					 
					
						
						
							
							CS-16573: cloudstack UI - update template - encode data passed to API call.  
						
						
						
						
					 
					
						2012-10-25 11:05:04 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							48c2e6b844 
							
						 
					 
					
						
						
							
							CS-16573: cloudstack UI - register ISO - encode data passed to API call.  
						
						
						
						
					 
					
						2012-10-24 15:09:07 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8fff59eb76 
							
						 
					 
					
						
						
							
							CS-16573: cloudstack UI - register template - encode data passed to API call.  
						
						
						
						
					 
					
						2012-10-24 15:08:35 -07:00 
						 
				 
			
				
					
						
							
							
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							8bb273de8f 
							
						 
					 
					
						
						
							
							Add tooltips to form fields  
						
						... 
						
						
						
						-Adds tooltips to all dialog-based form fields, to describe what each
 field represents. The tooltip appears on focus of the field, and
 hides once the field is blurred.
-Documentation content is pulled from a new namespace
 'cloudStack.docs', under docs.js. A new attribute, 'docID' is then
 specified on each createForm field to link the field to a specific
 tooltip string.
-If no docID is specified, then no tooltip is rendered.
-This only applies to the 'generic' forms that are rendered using the
 createForm widget
-This still needs to be localized
Conflicts:
	ui/index.jsp
	ui/scripts/configuration.js
	ui/scripts/network.js
	ui/scripts/ui/dialog.js
	ui/scripts/vpc.js 
						
						
					 
					
						2012-10-22 15:18:22 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3605ee5564 
							
						 
					 
					
						
						
							
							cloudstack UI - advanced search - implement advanced search on ISO page.  
						
						
						
						
					 
					
						2012-10-03 15:56:42 -07:00 
						 
				 
			
				
					
						
							
							
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							5dc1d468fe 
							
						 
					 
					
						
						
							
							cloudstack UI - advanced search - implement advanced search on template page.  
						
						
						
						
					 
					
						2012-10-03 15:40:26 -07:00