Sam Robertson 
							
						 
					 
					
						
						
						
						
							
						
						
							b4ddcfbe48 
							
						 
					 
					
						
						
							
							Cleaning up stuff, reorganizing parser into a class to make it more manageable  
						
						
						
						
					 
					
						2011-11-08 17:11:44 -08:00 
						 
				 
			
				
					
						
							
							
								Sam Robertson 
							
						 
					 
					
						
						
						
						
							
						
						
							3bdb5af2e2 
							
						 
					 
					
						
						
							
							initial checkin translator script to convert xml to python  
						
						
						
						
					 
					
						2011-11-06 20:59:07 -08: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 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							92eaf49f29 
							
						 
					 
					
						
						
							
							Add storage migration  
						
						
						
						
					 
					
						2011-10-24 15:59:47 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							4e595d04ab 
							
						 
					 
					
						
						
							
							Bug 11522 - New agent manager  
						
						... 
						
						
						
						1.load hosts that in maintenance mode because maintenance is no longer an agent status now
2.don't disconnect agent when entering maintenance mode, again it's no longer an agent status now 
						
						
					 
					
						2011-10-19 17:51:20 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							58fefd2891 
							
						 
					 
					
						
						
							
							Bug 11522 - New agent manager  
						
						... 
						
						
						
						initialize simulator test case 
						
						
					 
					
						2011-10-18 17:58:15 -07:00 
						 
				 
			
				
					
						
							
							
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							dc7ac31dce 
							
						 
					 
					
						
						
							
							1. correcting the global property 2. handling the case if unittest2 is present  
						
						... 
						
						
						
						(cherry picked from commit d1b71859c0d6bb054d64f38b7bc6f11d37bd1725) 
						
						
					 
					
						2011-08-29 18:44:57 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							db8341bb35 
							
						 
					 
					
						
						
							
							testClient: add timestamp for sync job  
						
						
						
						
					 
					
						2011-08-25 18:56:28 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c8dafa8628 
							
						 
					 
					
						
						
							
							add missing files  
						
						
						
						
					 
					
						2011-08-25 18:56:24 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							9777b7d193 
							
						 
					 
					
						
						
							
							testclient: fix fix asyn job query for sync command  
						
						
						
						
					 
					
						2011-08-25 18:56:20 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							f8aaf1a126 
							
						 
					 
					
						
						
							
							TestClient: use json instead of painful XML  
						
						
						
						
					 
					
						2011-08-25 18:56:05 -07:00 
						 
				 
			
				
					
						
							
							
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							81366d35c1 
							
						 
					 
					
						
						
							
							a. Test Discovery is only found in python 2.7+. unittest2 makes it backwards compatible for python 2.4-2.6  
						
						... 
						
						
						
						b. Adding traceback from pymysql to debug problems in connecting with database
(cherry picked from commit 81218d718af0ec101f7ba424c62bb6e0b5642744) 
						
						
					 
					
						2011-08-25 19:52:30 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							9391938908 
							
						 
					 
					
						
						
							
							fix conflict  
						
						
						
						
					 
					
						2011-08-24 18:47:09 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							4393162ecd 
							
						 
					 
					
						
						
							
							TestClient: fix npe  
						
						
						
						
					 
					
						2011-08-24 10:48:26 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							ac826a721e 
							
						 
					 
					
						
						
							
							TESTClient: async job threads can exit after job pool is empty  
						
						
						
						
					 
					
						2011-08-23 11:45:12 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							8a7feb8ec1 
							
						 
					 
					
						
						
							
							Merge branch '2.2.y'  
						
						... 
						
						
						
						Conflicts:
	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
	api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
	api/src/com/cloud/agent/api/to/FirewallRuleTO.java
	api/src/com/cloud/agent/api/to/IpAddressTO.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
	api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
	api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
	api/src/com/cloud/api/commands/UpdateNetworkCmd.java
	api/src/com/cloud/api/response/CapabilitiesResponse.java
	api/src/com/cloud/network/Network.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/firewall/FirewallService.java
	api/src/com/cloud/network/lb/LoadBalancingRule.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	api/src/com/cloud/network/rules/FirewallRule.java
	api/src/com/cloud/network/rules/RulesService.java
	api/src/com/cloud/offering/NetworkOffering.java
	client/tomcatconf/commands.properties.in
	cloud.spec
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	core/src/com/cloud/vm/DomainRouterVO.java
	debian/cloud-deps.install
	patches/systemvm/debian/config/etc/init.d/cloud-early-config
	patches/systemvm/debian/config/root/ipassoc.sh
	patches/systemvm/debian/config/root/loadbalancer.sh
	scripts/vm/hypervisor/kvm/rundomrpre.sh
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/agent/manager/AgentAttache.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/agent/manager/AgentMonitor.java
	server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	server/src/com/cloud/alert/ClusterAlertAdapter.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/cluster/ClusterManagerImpl.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/network/LoadBalancerVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDao.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/element/DhcpElement.java
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/FirewallManager.java
	server/src/com/cloud/network/rules/FirewallRuleVO.java
	server/src/com/cloud/network/rules/PortForwardingRuleVO.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/rules/StaticNatRuleImpl.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/server/ConfigurationServerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/StorageManager.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
	server/src/com/cloud/user/AccountManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDao.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
	setup/db/db/schema-222to224.sql
	setup/db/db/schema-227to228.sql
	setup/db/db/schema-228to229.sql
	setup/db/db/schema-229to2210.sql
	tools/testClient/README
	ui/scripts/cloud.core.instance.js
	utils/src/com/cloud/utils/SerialVersionUID.java
	utils/src/com/cloud/utils/db/ConnectionConcierge.java
	utils/src/com/cloud/utils/db/Merovingian2.java
	utils/src/com/cloud/utils/db/Transaction.java
	utils/src/com/cloud/utils/nio/Link.java
	utils/src/com/cloud/utils/nio/NioConnection.java
	utils/src/com/cloud/utils/time/InaccurateClock.java 
						
						
					 
					
						2011-08-22 20:28:30 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							3ccc790b1d 
							
						 
					 
					
						
						
							
							add sample code to config advanced zone  
						
						
						
						
					 
					
						2011-08-19 18:06:11 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							49f283f364 
							
						 
					 
					
						
						
							
							add sample code to config advanced zone  
						
						
						
						
					 
					
						2011-08-19 18:05:37 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							2e48a9188d 
							
						 
					 
					
						
						
							
							add new testcase class, make testcase pydev friendly  
						
						
						
						
					 
					
						2011-08-19 16:22:02 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							3466d3f637 
							
						 
					 
					
						
						
							
							add new testcase class, make testcase pydev friendly  
						
						
						
						
					 
					
						2011-08-19 16:21:16 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c57ca25d2a 
							
						 
					 
					
						
						
							
							need to update configuration  
						
						
						
						
					 
					
						2011-08-18 10:51:50 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							97e9a0171a 
							
						 
					 
					
						
						
							
							change parameters  
						
						
						
						
					 
					
						2011-08-18 10:51:44 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c707aeb5da 
							
						 
					 
					
						
						
							
							add more test cases  
						
						
						
						
					 
					
						2011-08-18 10:51:38 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							8fc6e18f46 
							
						 
					 
					
						
						
							
							fix typo  
						
						
						
						
					 
					
						2011-08-18 10:51:34 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							1bc7631bf2 
							
						 
					 
					
						
						
							
							finally, test framework works now  
						
						
						
						
					 
					
						2011-08-18 10:51:31 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							48494c5f20 
							
						 
					 
					
						
						
							
							generate json configuration file for any kind of data center setup, and deploy it  
						
						
						
						
					 
					
						2011-08-18 10:49:18 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							1600d70ca3 
							
						 
					 
					
						
						
							
							fix code generator, some api response is empty  
						
						
						
						
					 
					
						2011-08-18 10:49:18 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							1a82fd46b2 
							
						 
					 
					
						
						
							
							need to update configuration  
						
						
						
						
					 
					
						2011-08-17 18:21:54 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							54e4e0011b 
							
						 
					 
					
						
						
							
							change parameters  
						
						
						
						
					 
					
						2011-08-17 10:50:30 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							bb8265ded3 
							
						 
					 
					
						
						
							
							add more test cases  
						
						
						
						
					 
					
						2011-08-16 15:07:49 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							92131e9859 
							
						 
					 
					
						
						
							
							fix typo  
						
						
						
						
					 
					
						2011-08-16 10:30:52 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							449a12870b 
							
						 
					 
					
						
						
							
							finally, test framework works now  
						
						
						
						
					 
					
						2011-08-16 10:30:52 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							f4a6c314c5 
							
						 
					 
					
						
						
							
							generate json configuration file for any kind of data center setup, and deploy it  
						
						
						
						
					 
					
						2011-08-16 10:30:52 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							25ce6242c7 
							
						 
					 
					
						
						
							
							fix code generator, some api response is empty  
						
						
						
						
					 
					
						2011-08-16 10:30:52 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							e72dbbeeee 
							
						 
					 
					
						
						
							
							how to generate api spec file  
						
						
						
						
					 
					
						2011-08-15 17:44:56 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							7372f4a375 
							
						 
					 
					
						
						
							
							add more doc  
						
						
						
						
					 
					
						2011-08-11 13:28:33 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							9151bff1b2 
							
						 
					 
					
						
						
							
							fix typo  
						
						
						
						
					 
					
						2011-08-10 18:37:34 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							1cb9773d1a 
							
						 
					 
					
						
						
							
							fix typo  
						
						
						
						
					 
					
						2011-08-10 18:36:42 -07:00