olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							a06ed5728c 
							
						 
					 
					
						
						
							
							remove intermediate parent poms  
						
						 
						
						
						
						
					 
					
						2012-08-27 16:43:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							0d7601d2d7 
							
						 
					 
					
						
						
							
							Add a limit statement to the subquery  
						
						 
						
						
						
						
					 
					
						2012-08-27 09:14:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							3aa469da2a 
							
						 
					 
					
						
						
							
							groupdId is now org.apache.cloudstack  
						
						 
						
						
						
						
					 
					
						2012-08-25 09:20:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							cefc5cbff3 
							
						 
					 
					
						
						
							
							bug CS-16172  
						
						 
						
						... 
						
						
						
						Reviewed-by: chiradeep 
						
						
					 
					
						2012-08-24 16:13:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							0d9b81aac6 
							
						 
					 
					
						
						
							
							that was an unused import not a missing dependency  
						
						 
						
						
						
						
					 
					
						2012-08-25 00:44:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f9fdbcddb1 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC feature - localize network.js (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-24 15:41:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							e7b4e15b42 
							
						 
					 
					
						
						
							
							add missing dependency  
						
						 
						
						
						
						
					 
					
						2012-08-25 00:37:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							ccf624f7a8 
							
						 
					 
					
						
						
							
							add third party repo in pom to short cli to use  
						
						 
						
						
						
						
					 
					
						2012-08-25 00:16:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							071836327e 
							
						 
					 
					
						
						
							
							use maven compiler plugin 2.5.1 which is faster for multi modules builds  
						
						 
						
						
						
						
					 
					
						2012-08-25 00:12:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							7343ef20ee 
							
						 
					 
					
						
						
							
							use apache parent pom to inherits some datas  
						
						 
						
						
						
						
					 
					
						2012-08-25 00:10:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							e79e339682 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://git-wip-us.apache.org/repos/asf/incubator-cloudstack  
						
						 
						
						
						
						
					 
					
						2012-08-25 00:04:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							5ef60aceb1 
							
						 
					 
					
						
						
							
							%s/tab/ws/  
						
						 
						
						
						
						
					 
					
						2012-08-25 00:03:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							9fb282b366 
							
						 
					 
					
						
						
							
							use stable central repo url  
						
						 
						
						
						
						
					 
					
						2012-08-24 23:59:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							57f0f20dca 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC feature - add VPC localization labels for network.js in dictionary.jsp (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-24 14:56:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6807da63bb 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC feature - localize VPC labels in messages_ja.properties for network.js (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-24 14:56:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							de85e211c3 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC feature - localize VPC labels in messages_zh_CN.properties for network.js (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-24 14:55:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							caae9f7e04 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - VPC feature - localize VPC labels in messages.properties for network.js (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-24 14:54:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							726c4ed2b7 
							
						 
					 
					
						
						
							
							Add license  
						
						 
						
						
						
						
					 
					
						2012-08-24 11:18:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							4a4007e652 
							
						 
					 
					
						
						
							
							Add license  
						
						 
						
						
						
						
					 
					
						2012-08-24 11:18:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							ebc0fa458a 
							
						 
					 
					
						
						
							
							* Maven 3 support  
						
						 
						
						... 
						
						
						
						* Pretty Format POM's
* AWS API compiles now 
						
						
					 
					
						2012-08-24 11:18:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							c6a9e1b3a3 
							
						 
					 
					
						
						
							
							m2e doesn't like it when the project root is the source folder  
						
						 
						
						
						
						
					 
					
						2012-08-24 11:18:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							490e87a617 
							
						 
					 
					
						
						
							
							Fix small compilation issue encountered when building with maven  
						
						 
						
						
						
						
					 
					
						2012-08-24 11:18:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							f826971fea 
							
						 
					 
					
						
						
							
							Maven config, initial commit  
						
						 
						
						
						
						
					 
					
						2012-08-24 11:18:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							342481e603 
							
						 
					 
					
						
						
							
							docs: Add more Hypervisor and Management installation  
						
						 
						
						... 
						
						
						
						This commit also renames a lot of Management Server installation files to try to get
consistency in the naming of files.
It should make it easier to identify which files are for which section. 
						
						
					 
					
						2012-08-24 16:44:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							b1d52c4404 
							
						 
					 
					
						
						
							
							Make inclusion of cloud-vmware.jar in systemvm.iso conditional  
						
						 
						
						
						
						
					 
					
						2012-08-24 16:03:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							e3f2cf908a 
							
						 
					 
					
						
						
							
							Only use the PremiumSecondaryStorageResource if VmWare is the hypervisor  
						
						 
						
						
						
						
					 
					
						2012-08-24 15:57:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							d05106053a 
							
						 
					 
					
						
						
							
							fixed run-usage and debug-usage targets, deploy missing usage-components.xml and log4j-cloud_usage.xml  
						
						 
						
						
						
						
					 
					
						2012-08-24 16:59:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ewan Mellor 
							
						 
					 
					
						
						
						
						
							
						
						
							df7b12042a 
							
						 
					 
					
						
						
							
							Fix build-usage targe  
						
						 
						
						
						
						
					 
					
						2012-08-24 16:30:23 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1289b947f9 
							
						 
					 
					
						
						
							
							S2S VPN: Fix CheckS2SVpnConnectionsCommand on VMware  
						
						 
						
						
						
						
					 
					
						2012-08-23 18:30:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							a08ae8e42c 
							
						 
					 
					
						
						
							
							[ASFCS40]CS-15586: Public Vlan for an account fails in case of multiple Physical networks  
						
						 
						
						... 
						
						
						
						Changes:
- Since Now a zone can have multiple physical networks, we need to find the physical network Id from the networkOffering's tag and zoneId and trafficType when we create a guest network
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java 
						
						
					 
					
						2012-08-23 18:18:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							aec6b4af48 
							
						 
					 
					
						
						
							
							[ASFCS40]Upgrade to 4.0: host_details unique key addition needs IGNORE keyword to correct the duplicates  
						
						 
						
						
						
						
					 
					
						2012-08-23 17:52:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							e4c51e92ef 
							
						 
					 
					
						
						
							
							CS-16152:Projects:Not shown max.vpcs entry in the resourcelimits  
						
						 
						
						
						
						
					 
					
						2012-08-24 05:18:43 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							7f8734f124 
							
						 
					 
					
						
						
							
							CS-15802: cloudstack 3.0 UI - stop/reboot virtualRouter/network - add text "All services provided by this virtualRouter/network will be interrupted" in confirm dialog.  
						
						 
						
						
						
						
					 
					
						2012-08-23 14:08:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							00323f0e5a 
							
						 
					 
					
						
						
							
							CS-15967: Don't pass projectId=-1 to zone->guest networks list  
						
						 
						
						... 
						
						
						
						reviewed-by: jessica 
						
						
					 
					
						2012-08-23 13:16:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							c0b92958ef 
							
						 
					 
					
						
						
							
							CS-16001: Show VPC router details for domain admins  
						
						 
						
						
						
						
					 
					
						2012-08-23 12:26:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							b302ed904a 
							
						 
					 
					
						
						
							
							CS-16144: Show warning before enabling local storage in zone wizard  
						
						 
						
						... 
						
						
						
						Conflicts:
	ui/dictionary.jsp 
						
						
					 
					
						2012-08-23 11:08:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							7e3b4408cb 
							
						 
					 
					
						
						
							
							UI create form: Support custom checkbox 'on change' event  
						
						 
						
						... 
						
						
						
						If field is a checkbox (isBoolean: true) and onChange function is
specified, then call this onChange everytime checkbox is clicked. 
						
						
					 
					
						2012-08-23 11:08:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							b5d00724fa 
							
						 
					 
					
						
						
							
							cloudstack 3.0 UI - basic zone - elastic IP - Add Load Balancer tab - Add VMs button - add a comment to specify code area. (Reviewed-by: Brian)  
						
						 
						
						
						
						
					 
					
						2012-08-23 10:40:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							879d62d881 
							
						 
					 
					
						
						
							
							enable tampa pre-release  
						
						 
						
						
						
						
					 
					
						2012-08-23 12:32:10 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							cebd9444be 
							
						 
					 
					
						
						
							
							fixing the xen systemvm template guest os to reflect the right one  
						
						 
						
						
						
						
					 
					
						2012-08-23 12:25:46 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							3298a481a8 
							
						 
					 
					
						
						
							
							For assignVM, marking older snapshots removed in db  
						
						 
						
						
						
						
					 
					
						2012-08-23 12:22:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							6f26894eaf 
							
						 
					 
					
						
						
							
							Fix for a corner case during fullsync where it tolerates a VM to exist on two clusters by virtue of it’s current host id and last host id (being on two diff clusters).  
						
						 
						
						
						
						
					 
					
						2012-08-23 12:13:53 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							e6ef6985f8 
							
						 
					 
					
						
						
							
							CS-16138: Fix instance wizard 'add network' radio button  
						
						 
						
						... 
						
						
						
						When no guest networks are present but VPC tier is, fix 'add new
network' radio button being unselected.
reviewed-by: jessica 
						
						
					 
					
						2012-08-22 15:24:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							f1eab9b6a4 
							
						 
					 
					
						
						
							
							Added tools/devcloud/devcloudbox/.vagrant to .gitignore  
						
						 
						
						
						
						
					 
					
						2012-08-22 16:33:36 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Pranav Saxena 
							
						 
					 
					
						
						
						
						
							
						
						
							2cd6382f73 
							
						 
					 
					
						
						
							
							CS-16133:Removing the infinte API add load balancer calls in a basic zone while adding VMs to create a lb rule  
						
						 
						
						
						
						
					 
					
						2012-08-23 01:21:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							e0f505e36f 
							
						 
					 
					
						
						
							
							Patch from Greg Burd: Improve portability of the build-apidoc.sh script by replacing readlink  
						
						 
						
						... 
						
						
						
						Review: https://reviews.apache.org/r/6733/ 
Testing: Applied patch, and ran 'ant clean-all build-apidocs'
on both OSX and Ubuntu 12. Initial testing confirmed the issue
that Greg discovered on OSX.  After the patch, the docs built
correctly. 
						
						
					 
					
						2012-08-22 15:33:17 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							3ada5e4a46 
							
						 
					 
					
						
						
							
							VPC: CS-16100 - 1) when start VPC router, never pick up any other hypervisor besides vmWare and Xen 2) When start user vm in vpc network, throw an error when deploy from the tempalate of not supported hypervisor  
						
						 
						
						... 
						
						
						
						Reviewed-by: Frank Zhang
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java 
						
						
					 
					
						2012-08-22 11:53:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							4a2796d7c7 
							
						 
					 
					
						
						
							
							CS-16123: applied the patch from  https://reviews.apache.org/r/6723/  
						
						 
						
						... 
						
						
						
						original committer: Mice Xia 
						
						
					 
					
						2012-08-22 09:39:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							a5248f1cfc 
							
						 
					 
					
						
						
							
							Fix for dns issue in multiple pods  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2012-08-22 16:48:41 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							eb4e09ec58 
							
						 
					 
					
						
						
							
							CS-16048 Failled to assign VLAN to storage network in zoneWizard  
						
						 
						
						
						
						
					 
					
						2012-08-22 18:06:03 +08:00