frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2fe8ee4d5e 
							
						 
					 
					
						
						
							
							fix build after awsapi merge  
						
						 
						
						
						
						
					 
					
						2012-05-25 16:43:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							eb864814a9 
							
						 
					 
					
						
						
							
							thirdparty library needed for awsapi  
						
						 
						
						
						
						
					 
					
						2012-05-25 15:49:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							3d4edfed03 
							
						 
					 
					
						
						
							
							CS-15099: Merge reviewed changes  
						
						 
						
						... 
						
						
						
						commit 17d4337f2d0b35acb414cbe0a19627fc75c0ca00
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Sat May 26 02:54:18 2012 +0530
    CS-15099:Account deletion - buttons overlap the text on the Account deletion confirmation page. 
						
						
					 
					
						2012-05-25 14:55:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							74beef1012 
							
						 
					 
					
						
						
							
							merge awsapi deps to master  
						
						 
						
						
						
						
					 
					
						2012-05-25 14:41:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							49cdc2317b 
							
						 
					 
					
						
						
							
							merge awsapi build script changes to master  
						
						 
						
						
						
						
					 
					
						2012-05-25 14:40:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							3fd17ae029 
							
						 
					 
					
						
						
							
							Merge awsapi related changes to CloudStack  
						
						 
						
						
						
						
					 
					
						2012-05-25 14:40:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							bc7dbd7d96 
							
						 
					 
					
						
						
							
							Merging awsapi component to master  
						
						 
						
						
						
						
					 
					
						2012-05-25 14:40:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							9aaaab0ebe 
							
						 
					 
					
						
						
							
							Merging awsapi-setup to master  
						
						 
						
						
						
						
					 
					
						2012-05-25 14:40:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							f1fae9d57f 
							
						 
					 
					
						
						
							
							CS-14753: When Vm is deployed with a Security Group , it also gets associated with the default security group.  
						
						 
						
						... 
						
						
						
						Changes:
- StartVM needed to be changed to add default security group only when none is present.
- DeployVm: createAdvancedSecurityGroupVirtualMachine changed to follow the same rule - add default SG only if none is specified. 
						
						
					 
					
						2012-05-25 14:40:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							0c1c9141f4 
							
						 
					 
					
						
						
							
							DeployVMCmd: Do not place the instance in default security group if groupId is provided  
						
						 
						
						
						
						
					 
					
						2012-05-25 14:40:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							c71790b5c7 
							
						 
					 
					
						
						
							
							CS-15096: Disable network actions for non-admins  
						
						 
						
						... 
						
						
						
						reviewed-by: jessica 
						
						
					 
					
						2012-05-25 12:55:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							70687e4b44 
							
						 
					 
					
						
						
							
							CS-14844: Fix edit action  
						
						 
						
						... 
						
						
						
						Fix edit action by referring to the new td.value <span>, instead of
td.value 
						
						
					 
					
						2012-05-25 12:24:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							96982933df 
							
						 
					 
					
						
						
							
							CS-14844  
						
						 
						
						... 
						
						
						
						-If value label in detail view gets too long, then add horizontal
 scrollbar to value, to avoid truncation
-Lower font size to 11px (-1px) to better fit longer data into UI
reviewed-by: sonny 
						
						
					 
					
						2012-05-25 12:08:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							d646f30e7a 
							
						 
					 
					
						
						
							
							bug CS-15095: vm cpu freq <= host cpu freq  
						
						 
						
						
						
						
					 
					
						2012-05-25 11:17:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							dd3b40218b 
							
						 
					 
					
						
						
							
							CS-12111: No e-mail validation for edit user form  
						
						 
						
						... 
						
						
						
						reviewed-by: brian 
						
						
					 
					
						2012-05-25 11:09:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							0753b1035f 
							
						 
					 
					
						
						
							
							CS-13091: Remove enable/disable physical network actions  
						
						 
						
						... 
						
						
						
						Due to limitations in the API, for now the enable/disable
functionality for physical networks will be removed. 
						
						
					 
					
						2012-05-25 11:01:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							66c6d1ceba 
							
						 
					 
					
						
						
							
							CS-13739: check in Japanese translation file from Japan team  
						
						 
						
						
						
						
					 
					
						2012-05-25 10:56:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a74e8d8b6b 
							
						 
					 
					
						
						
							
							bug CS-15094: cpu limit is cpuspeed*cpucount  
						
						 
						
						
						
						
					 
					
						2012-05-25 10:52:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c7bffc7b89 
							
						 
					 
					
						
						
							
							CS-15082: changed search criteria for Running vms in Network. Ip4 Address for guest network can be null for nic in Basic zone when vm originally fails to start.  
						
						 
						
						... 
						
						
						
						Reviewed-by: Frank 
						
						
					 
					
						2012-05-25 10:18:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							4b67937556 
							
						 
					 
					
						
						
							
							CS-15089: cloud-sysvmadm - fixed broken parsing in queryAsyncJobResult part of the code  
						
						 
						
						... 
						
						
						
						reviewed-by: Frank Zhang 
						
						
					 
					
						2012-05-25 10:15:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							4bb4e98eae 
							
						 
					 
					
						
						
							
							bug CS-14945: Throw an error message if the user is trying to attach the volume in local only storage zone.  
						
						 
						
						... 
						
						
						
						Reviewed-by: Kishan 
						
						
					 
					
						2012-05-25 18:46:44 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							fff3fdb216 
							
						 
					 
					
						
						
							
							CS-12407: F5 & Netscaler  when dedicated is selected  capacity field should be disabled.  
						
						 
						
						
						
						
					 
					
						2012-05-25 12:09:56 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							92442765d4 
							
						 
					 
					
						
						
							
							CS-12407: F5 & Netscaler  when dedicated is selected  capacity field should be disabled.  
						
						 
						
						
						
						
					 
					
						2012-05-25 12:09:29 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							b01a18a5ba 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2012-05-25 11:55:36 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							835afec6b9 
							
						 
					 
					
						
						
							
							Nexus Vswitch UI development modified enable disable and list vswitch response  
						
						 
						
						
						
						
					 
					
						2012-05-25 11:52:48 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1e84fa4b12 
							
						 
					 
					
						
						
							
							bug CS-14964: use shorter UUID for datastore names  
						
						 
						
						
						
						
					 
					
						2012-05-24 15:21:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b6e5530a0b 
							
						 
					 
					
						
						
							
							CS-15080 - add support for private network on a VLAN under VMware  
						
						 
						
						
						
						
					 
					
						2012-05-24 15:14:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							e96de4bc28 
							
						 
					 
					
						
						
							
							CS-14826, CS-14996: fix the md5 checksum  
						
						 
						
						
						
						
					 
					
						2012-05-24 15:09:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							f6efcd39a3 
							
						 
					 
					
						
						
							
							CS-15083: fixed source nat ip assoc for the case when account owns more than 1 guest network, and 1+ public account specific ranges  
						
						 
						
						
						
						
					 
					
						2012-05-24 13:47:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							c4e82930a8 
							
						 
					 
					
						
						
							
							NexusVswitch UI development  
						
						 
						
						
						
						
					 
					
						2012-05-25 01:11:38 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							45311fefc1 
							
						 
					 
					
						
						
							
							CS-13739: Localize 'login' button  
						
						 
						
						
						
						
					 
					
						2012-05-24 12:41:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							88d66e89fa 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2012-05-25 00:48:14 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							9f2a823d6e 
							
						 
					 
					
						
						
							
							CS-13091: Enable/disable physical network UI actions  
						
						 
						
						
						
						
					 
					
						2012-05-24 12:17:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							63116385c4 
							
						 
					 
					
						
						
							
							CS-14053: IE compatibility issues  
						
						 
						
						
						
						
					 
					
						2012-05-25 00:42:23 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							434f166c02 
							
						 
					 
					
						
						
							
							Removed unused comments  
						
						 
						
						
						
						
					 
					
						2012-05-24 12:04:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e65465929d 
							
						 
					 
					
						
						
							
							CS-15082: don't allow to remove guest network in Basic zone when there are non-expunged CPVM/SSVMs using it.  
						
						 
						
						
						
						
					 
					
						2012-05-24 11:38:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							28b0df590e 
							
						 
					 
					
						
						
							
							CS-15078:Standard name for vSwitch  
						
						 
						
						
						
						
					 
					
						2012-05-25 00:00:37 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f2746b0628 
							
						 
					 
					
						
						
							
							add new labels in Chinese translation file.  
						
						 
						
						
						
						
					 
					
						2012-05-24 10:52:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							8581d02ee8 
							
						 
					 
					
						
						
							
							CS-14946, check if it is linux bridge before call ovs  
						
						 
						
						
						
						
					 
					
						2012-05-23 19:06:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							3d74115769 
							
						 
					 
					
						
						
							
							CS-14784, CS-15065 , after release IP,  reapply other IPs in the same eth device, to prevent secondary IPs are removed when primary IP is removed  
						
						 
						
						
						
						
					 
					
						2012-05-23 18:42:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							89f704d88c 
							
						 
					 
					
						
						
							
							CS-13739: localize more labels  
						
						 
						
						
						
						
					 
					
						2012-05-23 17:21:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							96d7dca68b 
							
						 
					 
					
						
						
							
							CS-15070: remove invalid refs from storage_pool_host_ref  
						
						 
						
						... 
						
						
						
						Conflicts:
	setup/db/db/schema-302to303.sql 
						
						
					 
					
						2012-05-23 14:50:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							593ce7c490 
							
						 
					 
					
						
						
							
							CS-14989: cloudstack 3.0 UI - VM wizard - select template step - populate only templates whose hypervisor(s) are supported in the selected zone.  
						
						 
						
						
						
						
					 
					
						2012-05-23 14:15:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							7eb9977b86 
							
						 
					 
					
						
						
							
							Don't send VSM details if vSwitch isn't enabled  
						
						 
						
						
						
						
					 
					
						2012-05-23 13:09:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3d7d23d84c 
							
						 
					 
					
						
						
							
							Revert "bug 10946: Add default buffer length for compressed request"  
						
						 
						
						... 
						
						
						
						This reverts commit e3d30c6be661bc52bcac23470f14bd0bd89b8641.
This fix CS-14646. 
						
						
					 
					
						2012-05-23 12:13:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ewan Mellor 
							
						 
					 
					
						
						
						
						
							
						
						
							93ce302db3 
							
						 
					 
					
						
						
							
							Added a category declaration for CiscoNexus (I put it in the Network category)  
						
						 
						
						... 
						
						
						
						and improved the exception. 
						
						
					 
					
						2012-05-23 12:06:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							8a5211f62c 
							
						 
					 
					
						
						
							
							vSwitch UI fixes  
						
						 
						
						... 
						
						
						
						commit 531ebe165de441fdf8e8bb86c76056504cf3aadb
Author: Brian Federle <brian.federle@citrix.com>
Date:   Wed May 23 10:27:51 2012 -0700
    Fix vSwitch password field
commit e51a0bd5e198483704d6d7f2dc4cb4c74e7c9167
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Wed May 23 19:40:13 2012 +0530
    CS-9919: Changes to integrate UI changes for nexus feature 
						
						
					 
					
						2012-05-23 11:15:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1fa25b1964 
							
						 
					 
					
						
						
							
							CS-14206: cloudstack 3.0 UI - create network offering - show LB Isolation dropdown when LB service is checked and LB service provider is Netscaler or F5, regardless of Guest Type.  
						
						 
						
						
						
						
					 
					
						2012-05-23 10:40:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							4fbf6bb95a 
							
						 
					 
					
						
						
							
							Package imports for remoteSSHClient were not correct  
						
						 
						
						
						
						
					 
					
						2012-05-23 12:24:38 +05:30