ahuang 
							
						 
					 
					
						
						
						
						
							
						
						
							17984a3f8c 
							
						 
					 
					
						
						
							
							Removed the plug and unplug method from VMGuru.  Why should VMGuru understand how to plug and unplug nics?  Part of componentizing the vmsync work  
						
						 
						
						
						
						
					 
					
						2013-07-15 11:00:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							c11dbad9c9 
							
						 
					 
					
						
						
							
							merge master  
						
						 
						
						
						
						
					 
					
						2013-05-11 15:28:43 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							183b989d30 
							
						 
					 
					
						
						
							
							CLOUDSTACK-664:AWS-Health Check feature: Patch applied cleanly , RAT build is successful  
						
						 
						
						
						
						
					 
					
						2013-03-18 14:01:15 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							80d58b6c73 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-20 16:42:56 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							176523254e 
							
						 
					 
					
						
						
							
							Improve component lifecycle management with system run-level concept  
						
						 
						
						
						
						
					 
					
						2013-01-30 15:21:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							aa7b3e0f6d 
							
						 
					 
					
						
						
							
							Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId  
						
						 
						
						... 
						
						
						
						Corresponding getter/setter is renamed too.
Reason is GenericDao does not update the field unless the method name matches the field name; the setter of this VO was one such case. 
						
						
					 
					
						2013-01-22 12:56:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							4fbecf15ec 
							
						 
					 
					
						
						
							
							add unit test back, primary storage life cycle is tested  
						
						 
						
						
						
						
					 
					
						2013-01-21 17:01:00 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							10d9c019a9 
							
						 
					 
					
						
						
							
							All merge conflicts resolved  
						
						 
						
						
						
						
					 
					
						2013-01-18 12:14:57 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							cadca5fc0c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into network-refactor-merge2  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
	server/src/com/cloud/acl/DomainChecker.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java 
						
						
					 
					
						2013-01-16 19:17:14 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							56e5fbdee2 
							
						 
					 
					
						
						
							
							removed import of componentlocator and inject from all files  
						
						 
						
						
						
						
					 
					
						2013-01-10 11:44:47 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							504264236c 
							
						 
					 
					
						
						
							
							Network-refactor: In preparation for moving the read-only interface NetworkModel  
						
						 
						
						... 
						
						
						
						to the api project, ensure that all methods use interfaces from the api project.
By moving it to the api project, it lessens the dependency of plugins on the server components.
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org> 
						
						
					 
					
						2013-01-09 15:49:01 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							5a830c4db0 
							
						 
					 
					
						
						
							
							Network-refactor: Refactor NetworkManager into NetworkModel and NetworkManager.  
						
						 
						
						... 
						
						
						
						NetworkManager's exclusive focus is now
 - handling plugins during orchestration, and
 - to deal with ip address allocation.
Those classes that used to refer to NetworkManager to get access to the datamodel now refer to NetworkModel
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org> 
						
						
					 
					
						2013-01-09 15:49:01 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							cf8de7ee17 
							
						 
					 
					
						
						
							
							Removed all the .project files  
						
						 
						
						
						
						
					 
					
						2013-01-08 14:11:00 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							30f2565d98 
							
						 
					 
					
						
						
							
							Merge branch 'api_refactoring' into javelin  
						
						 
						
						
						
						
					 
					
						2013-01-08 12:36:04 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							5119785cf7 
							
						 
					 
					
						
						
							
							Get latest changes, merge branch 'master' into api_refactoring  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
	setup/db/db/schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-04 22:21:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							177e157cbf 
							
						 
					 
					
						
						
							
							CLOUDSTACK-306: Move inline mode parameter from device to network offering  
						
						 
						
						... 
						
						
						
						One F5 device can be used as inline and side-by-side at the same time(for
different networks). So we can define inline or not on network base. 
						
						
					 
					
						2013-01-04 19:17:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							2e9c55f8f6 
							
						 
					 
					
						
						
							
							More Spring issues to bootstrape javalin server  
						
						 
						
						
						
						
					 
					
						2013-01-04 14:25:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							259e6d5f74 
							
						 
					 
					
						
						
							
							Fix a few Spring bootstrap issues  
						
						 
						
						
						
						
					 
					
						2012-12-27 17:46:52 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							057ac12d23 
							
						 
					 
					
						
						
							
							Enforce InternalIdentity interface on all VO classes that impls long getId()  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-26 15:09:44 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							296b49c2f8 
							
						 
					 
					
						
						
							
							Merge branch 'master' into test-merge-api  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-23 13:54:46 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							af28c06998 
							
						 
					 
					
						
						
							
							api: move and group all under command, org.apache.cloudstack.command.*  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-07 18:30:54 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							2b74b6e827 
							
						 
					 
					
						
						
							
							Start removing the old ant build files  
						
						 
						
						... 
						
						
						
						Removed all build.xml files from the plugins 
						
						
					 
					
						2012-12-07 15:58:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							456b852c0c 
							
						 
					 
					
						
						
							
							api_refactor: refactor loadbalancer apis  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-04 11:25:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Deepak Garg 
							
						 
					 
					
						
						
						
						
							
						
						
							bf1e6ed991 
							
						 
					 
					
						
						
							
							CS-15644-Autoscale: Implemented UUIDs for templateId-serviceOff Reviewed-By:Vijay  
						
						 
						
						
						
						
					 
					
						2012-11-16 10:56:58 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vijay 
							
						 
					 
					
						
						
						
						
							
						
						
							dda4d39b55 
							
						 
					 
					
						
						
							
							AutoScale changes in Apache master  
						
						 
						
						
						
						
					 
					
						2012-11-16 10:56:44 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							cea8f3bf37 
							
						 
					 
					
						
						
							
							Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation  
						
						 
						
						
						
						
					 
					
						2012-11-07 15:03:22 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							aab02e2743 
							
						 
					 
					
						
						
							
							Add Spring annotation to major components  
						
						 
						
						
						
						
					 
					
						2012-11-07 14:53:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							91e68b5f2c 
							
						 
					 
					
						
						
							
							A bunch of .project changes again  
						
						 
						
						
						
						
					 
					
						2012-11-04 19:25:03 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f92ce72639 
							
						 
					 
					
						
						
							
							Correct dependency errors  
						
						 
						
						
						
						
					 
					
						2012-10-24 11:12:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							059f605ace 
							
						 
					 
					
						
						
							
							add more interfaces  
						
						 
						
						
						
						
					 
					
						2012-10-22 17:50:51 -07: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							5fee891162 
							
						 
					 
					
						
						
							
							merge from master  
						
						 
						
						
						
						
					 
					
						2012-10-11 17:42:25 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jie Feng 
							
						 
					 
					
						
						
						
						
							
						
						
							c9aa08350a 
							
						 
					 
					
						
						
							
							[DOC] docbook conversion - choosing a deployment architecture  
						
						 
						
						
						
						
					 
					
						2012-09-13 16:12:06 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							1d0a10c69e 
							
						 
					 
					
						
						
							
							Merged master over to javelin to get new poms and maven build  
						
						 
						
						
						
						
					 
					
						2012-09-05 14:31:24 -07: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 
							
						 
					 
					
						
						
						
						
							
						
						
							a06ed5728c 
							
						 
					 
					
						
						
							
							remove intermediate parent poms  
						
						 
						
						
						
						
					 
					
						2012-08-27 16:43:24 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							048c5e50cf 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						 
						
						... 
						
						
						
						Conflicts:
	utils/test/com/cloud/utils/component/MockComponentLocator.java 
						
						
					 
					
						2012-08-08 11:50:39 -07:00