Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							3429c55e55 
							
						 
					 
					
						
						
							
							Implement PlugNicCommand,UnPlugNicCommand for KVM  
						
						 
						
						... 
						
						
						
						This is part 1 in enabling VPC for KVM. The various commands needing
implementation will be submitted individually unless I'm told to do
otherwise, in case I don't complete all of the commands, such that
someone else can take over or build on my work.
RB: https://reviews.apache.org/r/6859 
Send-by: shadowsor@gmail.com  
						
						
					 
					
						2012-08-30 10:28:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gavin Lee 
							
						 
					 
					
						
						
						
						
							
						
						
							d3921139ed 
							
						 
					 
					
						
						
							
							Patch from Gavin Lee: Change license to ASL2.0 in server and tools  
						
						 
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2012-08-30 10:36:29 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							a6be8c76c3 
							
						 
					 
					
						
						
							
							Reverting part of commit ff7c964a6621cf56d555120e9740dc87cf37b9eb (Add  
						
						 
						
						... 
						
						
						
						ability to do jetty:run in eclipse). This change breaks the ability to
upload scripts to XenServer (and possibly other places). Needs some
investigation before enabling this again. 
						
						
					 
					
						2012-08-30 16:10:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							2ba09d88c8 
							
						 
					 
					
						
						
							
							Patch from Gavin Lee: Change license to ASL2.0 in plugin  
						
						 
						
						
						
						
					 
					
						2012-08-30 09:17:11 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							34f007f13a 
							
						 
					 
					
						
						
							
							Current working dir for jetty:run Eclipse configuration is half way broken  
						
						 
						
						
						
						
					 
					
						2012-08-30 09:00:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							f7acd8fed8 
							
						 
					 
					
						
						
							
							Create random version for StartupCommands in dev env setup  
						
						 
						
						
						
						
					 
					
						2012-08-30 08:47:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							0c915cd69e 
							
						 
					 
					
						
						
							
							bug CS-16171 : Cannot attach ISO on VMware VM due to Invalid datastore path error  
						
						 
						
						
						
						
					 
					
						2012-08-30 11:04:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							5c69742f7d 
							
						 
					 
					
						
						
							
							Update zone wizard disclaimer text for local storage  
						
						 
						
						... 
						
						
						
						Conflicts:
	client/WEB-INF/classes/resources/messages.properties 
						
						
					 
					
						2012-08-29 15:45:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							60df21a023 
							
						 
					 
					
						
						
							
							Merge S2S VPN for VMware  
						
						 
						
						
						
						
					 
					
						2012-08-29 14:17:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							0f0c08373f 
							
						 
					 
					
						
						
							
							Added XenServerJava BSD licensing information to the whisker descriptor and output LICENSE files.  
						
						 
						
						
						
						
					 
					
						2012-08-29 16:33:47 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							05fef0fb25 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC - localize Configure VPC Chart (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-29 13:29:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							8f9d6e48b8 
							
						 
					 
					
						
						
							
							Patch from Devdeep Singh: Applies the fixes/customization's that had been made to Xenserver java sdk source for CS  
						
						 
						
						
						
						
					 
					
						2012-08-29 15:57:17 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							7d59e6698c 
							
						 
					 
					
						
						
							
							Patch from Devdeep Singh: Importing the updated xenserver sdk source that comes with BSD license.  
						
						 
						
						
						
						
					 
					
						2012-08-29 15:56:25 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							43634b0e4b 
							
						 
					 
					
						
						
							
							Removing two files that the previous commit's submitted patch was unable to remove.  
						
						 
						
						
						
						
					 
					
						2012-08-29 15:55:36 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							75c3f2c999 
							
						 
					 
					
						
						
							
							Patch from Devdeep Singh: Removing the older Xenserver java sdk source.  
						
						 
						
						
						
						
					 
					
						2012-08-29 15:54:31 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							4a9f77610c 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - check in translated labels for VPC widget (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-29 10:58:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							6e421bc37a 
							
						 
					 
					
						
						
							
							add note on using ide debugger with tomcat7:run  
						
						 
						
						
						
						
					 
					
						2012-08-29 18:55:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							e756872c0a 
							
						 
					 
					
						
						
							
							use tomcat maven plugin 2.0-SNAPSHOT as it has fixed an issue needed here  
						
						 
						
						
						
						
					 
					
						2012-08-29 18:51:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							7bd5c58fc3 
							
						 
					 
					
						
						
							
							fix  http://bugs.cloud.com/show_bug.cgi?id=14775 , it happened when untagged network created on tagged vlan  
						
						 
						
						
						
						
					 
					
						2012-08-29 09:46:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							5751385444 
							
						 
					 
					
						
						
							
							do not activate cloud-client-ui by default as it needs nonoss modules too  
						
						 
						
						
						
						
					 
					
						2012-08-29 18:40:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							bf2601f1ea 
							
						 
					 
					
						
						
							
							Added steps to create a 12.04.1 Ubuntu template within VeeWee  
						
						 
						
						
						
						
					 
					
						2012-08-29 09:21:27 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							79ebffe4f3 
							
						 
					 
					
						
						
							
							CS-13594: Download template is unable to handle multiple SSVMs per zone  
						
						 
						
						... 
						
						
						
						Reviewed-by: Kishan 
						
						
					 
					
						2012-08-29 15:25:00 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							eb4a3cf6c8 
							
						 
					 
					
						
						
							
							bug CS-15398: fix for basic zone dns issue in multiple pods  
						
						 
						
						
						
						
					 
					
						2012-08-29 14:33:27 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							f128d8e123 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://hugo@git-wip-us.apache.org/repos/asf/incubator-cloudstack.git  
						
						 
						
						
						
						
					 
					
						2012-08-29 10:48:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							1b8b7b1bba 
							
						 
					 
					
						
						
							
							Help the magic a little bit  
						
						 
						
						
						
						
					 
					
						2012-08-29 10:47:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							d134a63ea8 
							
						 
					 
					
						
						
							
							CS-16147: Always show VPC section and VPN customer Gateway if advanced zone is present  
						
						 
						
						
						
						
					 
					
						2012-08-29 13:28:00 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							ad78a0e918 
							
						 
					 
					
						
						
							
							CS-16201:Network Page drop down shows VPN Customer Gateway even in Basic Zone  
						
						 
						
						
						
						
					 
					
						2012-08-29 12:30:47 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							d7b249fb01 
							
						 
					 
					
						
						
							
							Fixing UI compatibility with IE which was  broken because of license headers added to jsp file  
						
						 
						
						
						
						
					 
					
						2012-08-29 11:35:28 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							8884febe44 
							
						 
					 
					
						
						
							
							CS-15962: Inter VLAN Virtual router tab development under VPC section -fixing a typo  
						
						 
						
						
						
						
					 
					
						2012-08-29 11:11:40 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2e6759093c 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - Spanish translation file is out-of-date and never used in 3.0 UI, therefore remove it from branch.  
						
						 
						
						
						
						
					 
					
						2012-08-28 16:03:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							bbf8bed8ee 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC widget - localize text (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-28 15:59:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							5b556e202e 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - add translation labels for VPC widget. (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-28 15:59:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							8643e2c9ac 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://git-wip-us.apache.org/repos/asf/incubator-cloudstack  
						
						 
						
						
						
						
					 
					
						2012-08-29 00:09:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							5bb395ed0a 
							
						 
					 
					
						
						
							
							document non oss maven build activation  
						
						 
						
						
						
						
					 
					
						2012-08-29 00:08:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							de31ac34b4 
							
						 
					 
					
						
						
							
							configure tomcat maven plugin too  
						
						 
						
						
						
						
					 
					
						2012-08-29 00:05:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							f6f1be62b9 
							
						 
					 
					
						
						
							
							configuring tomcat maven plugin too  
						
						 
						
						
						
						
					 
					
						2012-08-28 23:58:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							55c67092d0 
							
						 
					 
					
						
						
							
							Commit for  https://reviews.apache.org/r/6547/  
						
						 
						
						
						
						
					 
					
						2012-08-28 14:58:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							155436870f 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - tagger widget - localize text (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-28 14:46:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							7999dd06ac 
							
						 
					 
					
						
						
							
							add note in README for installing maven third parties jars  
						
						 
						
						
						
						
					 
					
						2012-08-28 23:36:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							f218003607 
							
						 
					 
					
						
						
							
							Merge branch 'maven-final' of git://github.com/ibuildthecloud/incubator-cloudstack  
						
						 
						
						
						
						
					 
					
						2012-08-28 23:30:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							8c3450b503 
							
						 
					 
					
						
						
							
							CS-14770. ec2-run-instances and ec2-describe-instances don't return keypair information. Component: AWSAPI.  
						
						 
						
						
						
						
					 
					
						2012-08-28 13:52:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							a52889bb6a 
							
						 
					 
					
						
						
							
							CS-16196: Fix VM wizard network selects  
						
						 
						
						... 
						
						
						
						-Fixes case where 1 existing network is present, but cannot be
 unchecked when 'add new network' is checked
-Fixes regression with multiple networks and VPC tiers present, where
 unchecking all regular networks will select the hidden VPC network
reviewed-by: jessica 
						
						
					 
					
						2012-08-28 13:52:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							a319ac7055 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC - check in translated labels. (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-28 11:47:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							ff7c964a66 
							
						 
					 
					
						
						
							
							Add ability to do jetty:run in eclipse  
						
						 
						
						
						
						
					 
					
						2012-08-28 09:16:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							43e4de429e 
							
						 
					 
					
						
						
							
							Fix up some dependencies  
						
						 
						
						
						
						
					 
					
						2012-08-28 09:03:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							7fbc59d783 
							
						 
					 
					
						
						
							
							Add maven profiles for non-oss stuff  
						
						 
						
						
						
						
					 
					
						2012-08-28 09:02:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							8aa665d3ec 
							
						 
					 
					
						
						
							
							Third party repo no longer used  
						
						 
						
						
						
						
					 
					
						2012-08-28 09:02:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							d6c29fdc16 
							
						 
					 
					
						
						
							
							Wrong parent  
						
						 
						
						
						
						
					 
					
						2012-08-28 09:02:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							a9e7a8bac5 
							
						 
					 
					
						
						
							
							Add script to install non-oss deps in the local maven repo  
						
						 
						
						
						
						
					 
					
						2012-08-28 09:01:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							590f52df82 
							
						 
					 
					
						
						
							
							Include some missing resources in the jars  
						
						 
						
						
						
						
					 
					
						2012-08-28 08:59:20 -07:00