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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sheng Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							46a12b378c
							
						
					 | 
					
						
						
							
							CS-15243: Add service combination check at create network offering
						
						
						
						
						
						
					 | 
					
						2012-08-07 13:17:48 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alena Prokharchyk
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a72044dc7
							
						
					 | 
					
						
						
							
							Merge branch 'master' into vpc
						
						
						
						
						
						
					 | 
					
						2012-08-03 14:30:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alena Prokharchyk
							
						 
					 | 
					
						
						
						
						
							
						
						
							e7a1862867
							
						
					 | 
					
						
						
							
							VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr
						
						
						
						
						
						
						
						Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/ha/UserVmDomRInvestigator.java 
						
						
					 | 
					
						2012-08-03 14:23:45 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chip Childers
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a882fa17c
							
						
					 | 
					
						
						
							
							License header updates for the plugins folder.
						
						
						
						
						
						
					 | 
					
						2012-08-03 09:07:43 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kishan
							
						 
					 | 
					
						
						
						
						
							
						
						
							9611a017e9
							
						
					 | 
					
						
						
							
							bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
						
						
						
						
						
						
					 | 
					
						2012-07-27 23:37:46 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alena Prokharchyk
							
						 
					 | 
					
						
						
						
						
							
						
						
							a39fd61249
							
						
					 | 
					
						
						
							
							Merge branch 'master' into vpc
						
						
						
						
						
						
						
						Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java 
						
						
					 | 
					
						2012-07-27 13:47:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kishan
							
						 
					 | 
					
						
						
						
						
							
						
						
							468f2720eb
							
						
					 | 
					
						
						
							
							bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
						
						
						
						
						
						
					 | 
					
						2012-07-27 23:13:18 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alena Prokharchyk
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1acfd3bfa
							
						
					 | 
					
						
						
							
							Merge branch 'master' into vpc
						
						
						
						
						
						
						
						Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql 
						
						
					 | 
					
						2012-07-13 13:52:58 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b7b838c8a
							
						
					 | 
					
						
						
							
							CS-15544: recreate router if router filesystem is crashed
						
						
						
						
						
						
					 | 
					
						2012-07-11 16:14:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alena Prokharchyk
							
						 
					 | 
					
						
						
						
						
							
						
						
							31f9d718fb
							
						
					 | 
					
						
						
							
							Merge branch 'master' into vpc
						
						
						
						
						
						
						
						Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java 
						
						
					 | 
					
						2012-07-03 17:32:50 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Murali reddy
							
						 
					 | 
					
						
						
						
						
							
						
						
							9876d34ea4
							
						
					 | 
					
						
						
							
							moving out ELB network element to plugins/network-elements/elastic-loadbalancer
						
						
						
						
						
						
					 | 
					
						2012-07-02 15:05:58 -07:00 | 
					
					
						
						
							
							
							
						
					 |