Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							7b7f4cd1fd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-409: ThreadLocal Transaction and its db connection got reset for user managed db connnection, causing ClusterHeartBeat thread frequently trying to get db connection. Add unit test to test user managed transaction.  
						
						
						
						
					 
					
						2012-10-25 13:06:50 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							5b85edb961 
							
						 
					 
					
						
						
							
							bug CS-16034 getRandomIp can return -1 unexpectedly  
						
						... 
						
						
						
						also fixes unit test failures 
						
						
					 
					
						2012-08-16 11:42:25 -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 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							57b57703eb 
							
						 
					 
					
						
						
							
							fixed broken unit test  
						
						
						
						
					 
					
						2012-08-07 17:38:05 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d38e9eebed 
							
						 
					 
					
						
						
							
							VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/vpc/VpcManagerImpl.java 
						
						
					 
					
						2012-08-07 11:25:02 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							cf64fda5d5 
							
						 
					 
					
						
						
							
							VPC: unittest preparation  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java 
						
						
					 
					
						2012-08-07 11:23:52 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							84a1a311f9 
							
						 
					 
					
						
						
							
							S2S VPN: CS-15511: Add PFS support for VPN connection  
						
						
						
						
					 
					
						2012-08-06 15:27:13 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5a72044dc7 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						
						
						
					 
					
						2012-08-03 14:30:54 -07:00 
						 
				 
			
				
					
						
							
							
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							95ce55f0a1 
							
						 
					 
					
						
						
							
							License header updates for the utils folder  
						
						
						
						
					 
					
						2012-08-03 14:15:09 -04:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							e9ae7336c1 
							
						 
					 
					
						
						
							
							CS-15649: Remove DES from s2s vpn support policy  
						
						... 
						
						
						
						DES is considered INSECURE. 
						
						
					 
					
						2012-07-20 10:53:42 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							c0fcca3990 
							
						 
					 
					
						
						
							
							CS-15511: Not allow pfs parameter for customer VPN gateway  
						
						
						
						
					 
					
						2012-07-19 15:10:31 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							94c62f2127 
							
						 
					 
					
						
						
							
							CS-15513: Fix group 5 of s2s vpn  
						
						... 
						
						
						
						Conflicts:
	utils/test/com/cloud/utils/net/NetUtilsTest.java 
						
						
					 
					
						2012-07-10 10:38:17 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							24c480f9e6 
							
						 
					 
					
						
						
							
							CS-6840: Add commands for site-to-site vpn  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	utils/test/com/cloud/utils/net/NetUtilsTest.java 
						
						
					 
					
						2012-07-02 16:26:34 -07:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							937a9f7c45 
							
						 
					 
					
						
						
							
							fixing utils license header  
						
						
						
						
					 
					
						2012-06-06 23:06:02 -04:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							91fadc4a0d 
							
						 
					 
					
						
						
							
							fixing line ends in utils  
						
						
						
						
					 
					
						2012-04-09 20:05:41 -04:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2f634c0913 
							
						 
					 
					
						
						
							
							Switch to Apache license  
						
						
						
						
					 
					
						2012-04-03 04:50:05 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c42f50c4b0 
							
						 
					 
					
						
						
							
							Used a different way to allocate guest ip address.  not in used yet.  
						
						
						
						
					 
					
						2012-01-30 16:10:10 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ddbcd01f56 
							
						 
					 
					
						
						
							
							fixed up unit test  
						
						
						
						
					 
					
						2011-11-11 14:15:13 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f6fcaa49ec 
							
						 
					 
					
						
						
							
							Merge complete except for virtualnetworkappliancemanager  
						
						
						
						
					 
					
						2011-11-10 15:18:16 -08:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							a32c4f1ec6 
							
						 
					 
					
						
						
							
							Fixed unit tests  
						
						
						
						
					 
					
						2011-11-03 14:02:53 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							cef30956e9 
							
						 
					 
					
						
						
							
							Merge branch 'newagentmgr'  
						
						... 
						
						
						
						Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java 
						
						
					 
					
						2011-10-27 11:09:56 -07:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							8570b25506 
							
						 
					 
					
						
						
							
							NAAS: APIServer changes to introduce framework to read commands from pluggable components having separate commands.properties file  
						
						... 
						
						
						
						Changes:
- Added a new interface 'PluggableService'
- Any component that can be packaged separately from cloudstack, can implement this interface and provide its own property file listing the API commands the component supports
- As an example have made VirtualNetworkApplianceService pluggable and a new configureRouter command is added
- ComponentLocator reads all the pluggable service from componentLibrary or from components.xml and instantiates the services.
- As an example, DefaultComponentLibrary adds the pluggable service 'VirtualNetworkApplianceService'
- Also components.xml.in has an entry to show how a pluggable service can be added, but it is commented out.
- APIServer now reads the commands for each pluggable service and when a command for such a service is called, APIServer sets the required instance of the pluggable service in the coomand.
- To do this a new annotation '@PlugService' is added that is processed by APIServer. This eliminates the dependency on the BaseCmd to instantiate the service instances. 
						
						
					 
					
						2011-10-11 17:34:57 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							88b863d6e3 
							
						 
					 
					
						
						
							
							Bug 11522 - New agent manager  
						
						... 
						
						
						
						Initialize unit test case for resource manager 
						
						
					 
					
						2011-10-07 15:51:24 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							2a6de104e2 
							
						 
					 
					
						
						
							
							bug 11531: while taking snapshot on volume, if volume is attached to a VM instance and under VMware, check if there are other ongoing snapshot tasks for the VM instance.  
						
						
						
						
					 
					
						2011-09-22 16:22:12 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							262e6784e5 
							
						 
					 
					
						
						
							
							Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8  
						
						... 
						
						
						
						Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load
status 10860: resolved fixed 
						
						
					 
					
						2011-07-27 17:41:38 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5590cd93ce 
							
						 
					 
					
						
						
							
							bug 10716: Changed the connection's isolation level to allow for more concurrency  
						
						
						
						
					 
					
						2011-07-18 16:32:12 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							d925aa32e5 
							
						 
					 
					
						
						
							
							bug 10714: Implement packet fragmentation  
						
						... 
						
						
						
						Also add an simple nio unit test.
status 10714: resolved fixed 
						
						
					 
					
						2011-07-15 19:35:56 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							7a4af21f72 
							
						 
					 
					
						
						
							
							bug 10322: Transaction is using the new Merovingian  
						
						
						
						
					 
					
						2011-06-29 15:34:53 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							fefc798197 
							
						 
					 
					
						
						
							
							bug 10322: better mannered merovingians  
						
						
						
						
					 
					
						2011-06-29 12:03:22 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							687e9f6e67 
							
						 
					 
					
						
						
							
							bug 10322: arrival of the next generation Merovingians  
						
						
						
						
					 
					
						2011-06-29 12:03:05 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							251552f679 
							
						 
					 
					
						
						
							
							propagate loggin fixes  
						
						
						
						
					 
					
						2011-06-22 16:36:24 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							38ebac207b 
							
						 
					 
					
						
						
							
							bug 10375: Added logging for exception causes  
						
						
						
						
					 
					
						2011-06-22 11:51:54 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5771b35a7a 
							
						 
					 
					
						
						
							
							new log4j jar files and now the ability to get rid of the stupid cglib stack traces in our logs  
						
						
						
						
					 
					
						2011-06-21 01:12:06 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8754f8fab8 
							
						 
					 
					
						
						
							
							bug 9651: checked in missing files  
						
						
						
						
					 
					
						2011-05-31 10:27:50 -07:00 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							5401ee84ba 
							
						 
					 
					
						
						
							
							add support to run scripts on usage DB  
						
						
						
						
					 
					
						2011-04-05 16:11:02 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							b272d20d34 
							
						 
					 
					
						
						
							
							fixed junit framework  
						
						
						
						
					 
					
						2011-03-17 10:37:28 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							a86f6f085c 
							
						 
					 
					
						
						
							
							utilities for db unit test  
						
						
						
						
					 
					
						2011-02-28 14:40:02 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							378a0da0df 
							
						 
					 
					
						
						
							
							more unittest support  
						
						
						
						
					 
					
						2011-02-25 11:58:12 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							b6056bc0b1 
							
						 
					 
					
						
						
							
							missing files  
						
						
						
						
					 
					
						2011-02-22 19:12:10 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							6b0d4947ed 
							
						 
					 
					
						
						
							
							bug 8529: propagated to master.  Added junit test support to ant  
						
						
						
						
					 
					
						2011-02-16 17:40:58 -08:00 
						 
				 
			
				
					
						
							
							
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							05c020e1f6 
							
						 
					 
					
						
						
							
							Source code committed  
						
						
						
						
					 
					
						2010-08-11 09:13:29 -07:00