Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							059f605ace 
							
						 
					 
					
						
						
							
							add more interfaces  
						
						 
						
						
						
						
					 
					
						2012-10-22 17:50:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							53cea844bc 
							
						 
					 
					
						
						
							
							The interface change introduced by commit  
						
						 
						
						... 
						
						
						
						214bbf3ebd957f571901869f319da61ebad7ed23 broke the nonoss build. 
						
						
					 
					
						2012-10-18 09:40:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							214bbf3ebd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java
	server/src/com/cloud/network/element/CiscoNexusVSMElement.java
	server/src/com/cloud/network/element/ElasticLoadBalancerElement.java
	server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
	server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
	server/src/com/cloud/network/element/NetscalerElement.java
	server/src/com/cloud/network/element/OvsElement.java
	server/src/com/cloud/network/element/VpcJuniperSRXExternalFirewallElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
	server/src/com/cloud/storage/StorageManager.java 
						
						
					 
					
						2012-10-17 17:26:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							28c31e3707 
							
						 
					 
					
						
						
							
							truncate names that are longer than 40 characters, this is the max  
						
						 
						
						... 
						
						
						
						length nicira api accepts for display_name. 
						
						
					 
					
						2012-10-17 13:29:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							a4a3194899 
							
						 
					 
					
						
						
							
							Fix license headers  
						
						 
						
						
						
						
					 
					
						2012-10-15 10:22:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							b48d0d7d08 
							
						 
					 
					
						
						
							
							CLOUDSTACK-326: Removing extra license and README files  
						
						 
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2012-10-12 14:29:51 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							c07d6d28ee 
							
						 
					 
					
						
						
							
							Merge branch 'nicira-l3support'  
						
						 
						
						... 
						
						
						
						This commit merges the nicira-l3support branch with master. This
effectively adds nicira nvp l3 support to master. The NiciraNVP Provider
can support the following services with this modification: Connectivity,
SourceNat, StaticNat and PortForwarding
Testing done:
Create, Delete network offerings with Nicira Element
Use Gui to add, modify, remove Nicira Element and Provider
Provision, deprovision SourceNat networks
Provision, deprovision Portforwarding and StaticNat rules
Tested with Nicira NVP release 2.1.0, 2.2.0 and 2.2.1 (2.2.x recommended) 
						
						
					 
					
						2012-10-12 14:15:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							51f9a98871 
							
						 
					 
					
						
						
							
							Check all TODO and FIXME tasks  
						
						 
						
						
						
						
					 
					
						2012-10-12 12:02:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							ab8ba3d61d 
							
						 
					 
					
						
						
							
							Implement the portforwarding code in the resource  
						
						 
						
						... 
						
						
						
						Fix a small naming typo 
						
						
					 
					
						2012-10-12 11:57:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							5fee891162 
							
						 
					 
					
						
						
							
							merge from master  
						
						 
						
						
						
						
					 
					
						2012-10-11 17:42:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							553a72047f 
							
						 
					 
					
						
						
							
							Implement static nat handling  
						
						 
						
						
						
						
					 
					
						2012-10-11 18:13:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							18e11ac0c8 
							
						 
					 
					
						
						
							
							These need to be objects instead of primitives otherwise they get  
						
						 
						
						... 
						
						
						
						included by default during conversion to json. 
						
						
					 
					
						2012-10-05 09:27:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							aa6355ffe6 
							
						 
					 
					
						
						
							
							Updated master to 4.1.0  
						
						 
						
						... 
						
						
						
						mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer  -DdevelopmentVersion=4.1.0-SNAPSHOT 
						
						
					 
					
						2012-10-01 11:00:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							bb4dadaed8 
							
						 
					 
					
						
						
							
							small fixes  
						
						 
						
						
						
						
					 
					
						2012-10-01 10:12:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							c9b0b0b1a9 
							
						 
					 
					
						
						
							
							Add Nicira configuration to the UI  
						
						 
						
						
						
						
					 
					
						2012-09-30 23:33:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							c5634b9687 
							
						 
					 
					
						
						
							
							Wire the PortForwarding and StaticNat calls  
						
						 
						
						
						
						
					 
					
						2012-09-30 10:20:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							de41cb7cb5 
							
						 
					 
					
						
						
							
							Start implementing IpDeployer  
						
						 
						
						
						
						
					 
					
						2012-09-28 11:32:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							dd68a00338 
							
						 
					 
					
						
						
							
							Persist the uuid of the logical router once created  
						
						 
						
						
						
						
					 
					
						2012-09-27 22:16:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							af77912034 
							
						 
					 
					
						
						
							
							Keep naming consistent  
						
						 
						
						
						
						
					 
					
						2012-09-27 18:26:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							8ba7749869 
							
						 
					 
					
						
						
							
							Prepare all capabilities we will be supporting  
						
						 
						
						... 
						
						
						
						Remove the logical router if we are done with it. 
						
						
					 
					
						2012-09-27 18:24:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							fe997651a6 
							
						 
					 
					
						
						
							
							Wired up the creation of the SourceNat router in the element  
						
						 
						
						
						
						
					 
					
						2012-09-27 15:34:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							bfc8da1082 
							
						 
					 
					
						
						
							
							Update Nicira Api to support L3 functionality  
						
						 
						
						
						
						
					 
					
						2012-09-25 15:51:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							6eedfdfb79 
							
						 
					 
					
						
						
							
							Master pull  
						
						 
						
						
						
						
					 
					
						2012-09-14 11:20:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							763311c006 
							
						 
					 
					
						
						
							
							License header updates, and modification to root pom for exclusions.  
						
						 
						
						
						
						
					 
					
						2012-09-13 16:55:48 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jie Feng 
							
						 
					 
					
						
						
						
						
							
						
						
							c9aa08350a 
							
						 
					 
					
						
						
							
							[DOC] docbook conversion - choosing a deployment architecture  
						
						 
						
						
						
						
					 
					
						2012-09-13 16:12:06 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							db9cc97ab3 
							
						 
					 
					
						
						
							
							Brought over new changes from master  
						
						 
						
						
						
						
					 
					
						2012-09-13 11:43:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manikanta Kattamuri 
							
						 
					 
					
						
						
						
						
							
						
						
							cfc2b85651 
							
						 
					 
					
						
						
							
							Removing eclipse .classpath and .project files as they are configured to ant build and adding the entries into .gitignore to stop further comitting of the files  
						
						 
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2012-09-13 14:18:14 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							5532f58bbc 
							
						 
					 
					
						
						
							
							remove cloud.com license headers  
						
						 
						
						
						
						
					 
					
						2012-09-13 12:34:32 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							fe8a2992a2 
							
						 
					 
					
						
						
							
							Elimiate mystery guestIp in IpAddressTO  
						
						 
						
						... 
						
						
						
						Nobody can explain why it's there...
Also fix wrong return result of several empty network element callbacks 
						
						
					 
					
						2012-09-12 15:42:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							1d0a10c69e 
							
						 
					 
					
						
						
							
							Merged master over to javelin to get new poms and maven build  
						
						 
						
						
						
						
					 
					
						2012-09-05 14:31:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							2ba09d88c8 
							
						 
					 
					
						
						
							
							Patch from Gavin Lee: Change license to ASL2.0 in plugin  
						
						 
						
						
						
						
					 
					
						2012-08-30 09:17:11 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							2300310243 
							
						 
					 
					
						
						
							
							Messaging facility initials for new architecture  
						
						 
						
						
						
						
					 
					
						2012-08-28 17:58:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							fe8a01106b 
							
						 
					 
					
						
						
							
							rename cloud-plugins to cloudstack-plugins  
						
						 
						
						
						
						
					 
					
						2012-08-27 16:53:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							c68dd35b6e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://git-wip-us.apache.org/repos/asf/incubator-cloudstack  
						
						 
						
						
						
						
					 
					
						2012-08-27 16:44:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							a06ed5728c 
							
						 
					 
					
						
						
							
							remove intermediate parent poms  
						
						 
						
						
						
						
					 
					
						2012-08-27 16:43:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							e2b814d045 
							
						 
					 
					
						
						
							
							If there already is an entry in the nic mapping table for a starting VM,  
						
						 
						
						... 
						
						
						
						try to reconcile with the Nicira Controller. 
						
						
					 
					
						2012-08-27 13:41:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							3aa469da2a 
							
						 
					 
					
						
						
							
							groupdId is now org.apache.cloudstack  
						
						 
						
						
						
						
					 
					
						2012-08-25 09:20:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							5ef60aceb1 
							
						 
					 
					
						
						
							
							%s/tab/ws/  
						
						 
						
						
						
						
					 
					
						2012-08-25 00:03:23 +02: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							d06d6dae72 
							
						 
					 
					
						
						
							
							add maven eclipse project files from Darren  
						
						 
						
						
						
						
					 
					
						2012-08-23 17:55:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							9a51ff3bfc 
							
						 
					 
					
						
						
							
							Maven worksplace fixes/patches from Darren  
						
						 
						
						
						
						
					 
					
						2012-08-23 14:26:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							2f6cc4b0cb 
							
						 
					 
					
						
						
							
							Add license  
						
						 
						
						
						
						
					 
					
						2012-08-23 14:26:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							ad54ed1790 
							
						 
					 
					
						
						
							
							* Maven 3 support  
						
						 
						
						... 
						
						
						
						* Pretty Format POM's
* AWS API compiles now 
						
						
					 
					
						2012-08-23 14:26:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							f78aa9d98a 
							
						 
					 
					
						
						
							
							Fix small compilation issue encountered when building with maven  
						
						 
						
						
						
						
					 
					
						2012-08-23 14:26:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							b8e95e435f 
							
						 
					 
					
						
						
							
							Maven config, initial commit  
						
						 
						
						
						
						
					 
					
						2012-08-23 14:26:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							481aae1ebc 
							
						 
					 
					
						
						
							
							add recreate.systemvm.enabled parameter to control recreating systemvm  
						
						 
						
						
						
						
					 
					
						2012-08-20 11:19:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomoe@midokura.jp 
							
						 
					 
					
						
						
						
						
							
						
						
							ce12d0d70d 
							
						 
					 
					
						
						
							
							Submit Midokura SDN controller stubs  
						
						 
						
						
						
						
					 
					
						2012-08-13 18:55:11 +05:30