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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							bc4be5272b 
							
						 
					 
					
						
						
							
							Detail view: support per-action filtering  
						
						 
						
						... 
						
						
						
						Adds support for adding preFilter on a per-action basis, to assist in
plugin development. If action.preFilter function is passed, and returns
true/false, the action is shown/hidden. If no preFilter is specified,
then the action will be passed through the detail view's standard filter.
Example:
testAction: {
    label: 'Test Action',
    ...
    preFilter: function(args) {
        return false; // Action will be hidden
    },
    ...
} 
						
						
					 
					
						2014-06-18 14:02:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							dbbc6d42fd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6936: UI - (1)dialog widget > dropdown field > provide a blank option if there is no data for option(s) in a dropdown field. (2) Add Primary Storage dialog - cluster dropdown field - still calls args.response.success() when there is no data for option(s).  
						
						 
						
						
						
						
					 
					
						2014-06-18 12:23:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							6fcd4fbe7b 
							
						 
					 
					
						
						
							
							List view: Pass ID to action pre-filters  
						
						 
						
						
						
						
					 
					
						2014-06-18 11:52:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							04b1e31682 
							
						 
					 
					
						
						
							
							List view, multiSelect: Fix issue where $listView isn't always referenced  
						
						 
						
						
						
						
					 
					
						2014-06-16 14:11:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							8cf5192a6f 
							
						 
					 
					
						
						
							
							List view, multiselect: Only reference elements relative to $listView  
						
						 
						
						
						
						
					 
					
						2014-06-16 14:07:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3a3a3902b7 
							
						 
					 
					
						
						
							
							UI - modules - replace addExtraPropertiesIfDrModuleIncluded() with cloudStack.dr.sharedFunctions.addExtraProperties().  
						
						 
						
						
						
						
					 
					
						2014-06-13 16:44:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3acebf230c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6852: UI - modules - remove variable drModuleIncluded.  
						
						 
						
						
						
						
					 
					
						2014-06-13 15:21:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							7ea3930ae9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6867: Added option to upload the volume in VHDX format  
						
						 
						
						
						
						
					 
					
						2014-06-13 13:26:16 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							cd17061916 
							
						 
					 
					
						
						
							
							Detail view: Cleanup old tab content on change  
						
						 
						
						... 
						
						
						
						Add event handler on tab change to remove all old tab content. This prevents
potential conflicts with referencing widget data caused by old content laying
around. 
						
						
					 
					
						2014-06-12 13:33:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							37aabd1998 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6602: UI - VPC - createNetworkACL - fix a bug that caused wrong value being passed to action parameter in API call.  
						
						 
						
						
						
						
					 
					
						2014-06-11 16:10:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							fa3bda143f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6889: UI - create network offering - to reduce API call size, not pass any parameter whose value entered on UI happens to be the same as its default value at server-side.  
						
						 
						
						
						
						
					 
					
						2014-06-11 11:18:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							9334f26084 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6889: UI - create network offering - remove non-needed parameters from API call whose size might exceed limit in some cases.  
						
						 
						
						
						
						
					 
					
						2014-06-10 14:29:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							044c5e0eee 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6852: UI - modules - add DR fields to volume detailView, network detailView, zone detailView.  
						
						 
						
						
						
						
					 
					
						2014-06-09 11:43:20 -07: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							36ec16e4f5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6852: UI - modules - (1) add new shared function addExtraPropertiesIfDrModuleIncluded(). (2) add DR fields to Instances detailView.  
						
						 
						
						
						
						
					 
					
						2014-06-06 15:18:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ea196a4ffc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6858: UI - remove obsolete variable rootAccountId whose value is no longer 1.  
						
						 
						
						
						
						
					 
					
						2014-06-06 13:30:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							a8a853e322 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6852: UI - modules - add global variable drModuleIncluded.  
						
						 
						
						
						
						
					 
					
						2014-06-06 13:29:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							4b4fb1ac90 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6852: UI - attach volume action - VM dropdown - populate options based on whether module is included and whether service is enabled.  
						
						 
						
						
						
						
					 
					
						2014-06-05 13:49:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f2a8082a43 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6852: UI - add sharedFunction isModuleIncluded().  
						
						 
						
						
						
						
					 
					
						2014-06-05 13:48:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							2ac0013505 
							
						 
					 
					
						
						
							
							List view: multi-select actions: Show loading icon during action  
						
						 
						
						
						
						
					 
					
						2014-06-05 12:29:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							c312aa95c2 
							
						 
					 
					
						
						
							
							List view->Detail view: Add new parameter 'noPanelView'  
						
						 
						
						... 
						
						
						
						Adds 'noPanelView' option for detail view connected to list view. When
specified, don't support opening the detail view in a new browser pane (i.e.,
only render quickview). 
						
						
					 
					
						2014-06-03 11:25:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							0b5163f8cf 
							
						 
					 
					
						
						
							
							Tree view: Add event hook on sub-item removal  
						
						 
						
						
						
						
					 
					
						2014-05-29 14:02:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							9f4d464640 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6805: UI > create account > fix a bug that account creation failed when password contains # character.  
						
						 
						
						
						
						
					 
					
						2014-05-29 12:58:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							e656fd67a0 
							
						 
					 
					
						
						
							
							Tree view: Add event hook on sub-item creation  
						
						 
						
						
						
						
					 
					
						2014-05-29 12:53:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							8a6926606e 
							
						 
					 
					
						
						
							
							Treeview widget: Fix condition where browser is not present  
						
						 
						
						
						
						
					 
					
						2014-05-28 14:55:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							53ba037f86 
							
						 
					 
					
						
						
							
							Detail view: Fix case where view all link referenced wrong details object  
						
						 
						
						
						
						
					 
					
						2014-05-28 11:41:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							021a604493 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6789: UI > User page > fix a bug that a domain-admin was unable to delete other domain-admin in the same domain.  
						
						 
						
						
						
						
					 
					
						2014-05-27 15:45:53 -07: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gabor Apati-Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							9fa9e3aaff 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6565: [UI] New Zones tab for Templates and ISOs  
						
						 
						
						
						
						
					 
					
						2014-05-23 10:58:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							c769b32e70 
							
						 
					 
					
						
						
							
							List view: Support rendering data cells as a list  
						
						 
						
						... 
						
						
						
						If array is passed in field data, render the table cell as a list.
Example:
dataProvider: function(args) {
    args.response.success({ data: [ fieldA: ['i1', 'i2', ...] ] })
} 
						
						
					 
					
						2014-05-22 15:10:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							d36c731f79 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6744 > UI > zone wizard > baremetal hypervisor > support EIP ELB feature.  
						
						 
						
						
						
						
					 
					
						2014-05-21 17:22:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							96f092a0a9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6729: UI - create compute offering/create disk offering - determine whether to pass certain data to API comamnd upon isCustomized checkbox/isPublic checkbox's value.  
						
						 
						
						
						
						
					 
					
						2014-05-20 15:51:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							2c54e5e2c5 
							
						 
					 
					
						
						
							
							Detail view: Slice (clone) fields array to prevent duplicate fields  
						
						 
						
						
						
						
					 
					
						2014-05-16 08:27:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							3ab526433c 
							
						 
					 
					
						
						
							
							Detail view: Add event hook on field creation  
						
						 
						
						
						
						
					 
					
						2014-05-16 08:20:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							35cd61c463 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6649: CS is not giving the system-wide capacity for GPU reosurce.  
						
						 
						
						
						
						
					 
					
						2014-05-14 15:05:28 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							d7291e5200 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6379: UI > fix a bug that domain admin failed to be created when current login doesn't have visibility to root domain object.  
						
						 
						
						
						
						
					 
					
						2014-05-12 15:37:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gabor Apati-Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							58d913c25d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6606: Fixed: create network offering dailog box has greyed out (not selectable) providers for the connectivity service.  
						
						 
						
						
						
						
					 
					
						2014-05-12 13:56:05 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f2d9d71844 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6626: UI - fix a bug that g_userid was not declared.  
						
						 
						
						
						
						
					 
					
						2014-05-09 13:19:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							23c7a893e3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6589: UI > update ssl certificate > correct typo in success message - correct it from "Update SSL Certiciate succeeded" to "Update SSL Certificate succeeded"  
						
						 
						
						
						
						
					 
					
						2014-05-06 18:18:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c2c99dc1f6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6483: UI > Load Balancing > "VM+IP" listing > After removing a "VM+IP" under a LB rule, AddVMs dialog should reflect the change (i.e. show the removed IP in IP dropdown in AddVMs dialog)  
						
						 
						
						
						
						
					 
					
						2014-05-05 13:47:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dariusz Nejbauer 
							
						 
					 
					
						
						
						
						
							
						
						
							41684505d6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3932: UI: Fix Truncation issue in secondary storage URL  
						
						 
						
						... 
						
						
						
						Signed-off-by: Brian Federle <brian.federle@citrix.com> 
						
						
					 
					
						2014-05-05 12:15:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							6c44c0661d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6479: Strict and Preferred modes should only be allowed in Implict Dedication Planner Service Offerings.  
						
						 
						
						
						
						
					 
					
						2014-05-05 14:26:44 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							4f45c972c3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6438: Filter out existing IPs in dropdown  
						
						 
						
						
						
						
					 
					
						2014-05-01 15:40:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							9885cf4fb0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6438: WIP: Add filtering to check against existing IPs  
						
						 
						
						
						
						
					 
					
						2014-05-01 15:40:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							1ad532f57e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6438: WIP: If VM has additional IPs, keep showing in add screen  
						
						 
						
						
						
						
					 
					
						2014-05-01 15:40:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							f4779b4d0c 
							
						 
					 
					
						
						
							
							Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/user/AccountService.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2014-04-29 14:49:06 +05:30