Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bcca44e05f 
							
						 
					 
					
						
						
							
							1) Use correct command names in f5/juniper commands.properties file  
						
						 
						
						... 
						
						
						
						2) Fixed API doc to include f5/juniper/netscaler/virtualRouter commands 
						
						
					 
					
						2011-11-29 16:24:43 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							625a601615 
							
						 
					 
					
						
						
							
							correct ant build-apidoc  
						
						 
						
						
						
						
					 
					
						2011-10-18 14:31:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							ae83246acb 
							
						 
					 
					
						
						
							
							bug 11600: aquirelock before deleting a volume, which can be aquired by snapshot manager  
						
						 
						
						... 
						
						
						
						status 11600: resolved fixed 
						
						
					 
					
						2011-10-03 16:43:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							3947c9a126 
							
						 
					 
					
						
						
							
							Bug 11522 - New agent manager  
						
						 
						
						... 
						
						
						
						Initailize SearchCriteria2 in order to replace search interface of DAO 
						
						
					 
					
						2011-10-03 10:32:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2dcdb946d2 
							
						 
					 
					
						
						
							
							fix wrong unittest  
						
						 
						
						
						
						
					 
					
						2011-09-13 11:22:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							c826512ada 
							
						 
					 
					
						
						
							
							don't do compilation when deploying ovm  
						
						 
						
						
						
						
					 
					
						2011-08-30 15:43:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							4385a3d2de 
							
						 
					 
					
						
						
							
							deploy ovm scripts when deploying server  
						
						 
						
						
						
						
					 
					
						2011-08-30 15:28:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							0be1510496 
							
						 
					 
					
						
						
							
							add template for simulator  
						
						 
						
						
						
						
					 
					
						2011-08-16 10:30:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							52924ca993 
							
						 
					 
					
						
						
							
							Increase PermGen heap size to 128m for Tomcat debug session  
						
						 
						
						
						
						
					 
					
						2011-06-08 16:56:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							27d6020569 
							
						 
					 
					
						
						
							
							Ant target for apiDocs building  
						
						 
						
						
						
						
					 
					
						2011-06-07 11:21:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							48cc8480b2 
							
						 
					 
					
						
						
							
							move common mysql driver jar to Tomcat shared location in developer deployment, let CloudStack be friendly playing with other Web deployments like CloudBridge.  
						
						 
						
						
						
						
					 
					
						2011-05-27 16:00:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ea9703997b 
							
						 
					 
					
						
						
							
							proxy agent  
						
						 
						
						
						
						
					 
					
						2011-05-17 07:12:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							43c3c775f2 
							
						 
					 
					
						
						
							
							bug 9741: somehow some of the removed code got back into the code path.  Must have hit one undo too many.  
						
						 
						
						
						
						
					 
					
						2011-05-05 17:57:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							093fa851fa 
							
						 
					 
					
						
						
							
							made the upgrade utility work with the current version  
						
						 
						
						
						
						
					 
					
						2011-03-18 10:06:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8bec1e0b9f 
							
						 
					 
					
						
						
							
							added the concept of system integrity checking before a system starts  
						
						 
						
						
						
						
					 
					
						2011-03-16 17:59:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							851c3344fc 
							
						 
					 
					
						
						
							
							database upgrade  
						
						 
						
						
						
						
					 
					
						2011-03-09 17:56:11 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a5c21dc130 
							
						 
					 
					
						
						
							
							1) make JMX port configuration in deverloper build, 2) Add property map based dynamic bean  
						
						 
						
						
						
						
					 
					
						2011-03-09 11:59:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							d0892a964d 
							
						 
					 
					
						
						
							
							Add JMX monitoring to cluster management  
						
						 
						
						
						
						
					 
					
						2011-03-07 18:40:33 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ab3c719389 
							
						 
					 
					
						
						
							
							run the scripts  
						
						 
						
						
						
						
					 
					
						2011-02-28 14:37:30 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							378a0da0df 
							
						 
					 
					
						
						
							
							more unittest support  
						
						 
						
						
						
						
					 
					
						2011-02-25 11:58:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							b8cd91df9e 
							
						 
					 
					
						
						
							
							don't generate test-reports directory  
						
						 
						
						
						
						
					 
					
						2011-02-22 19:13:52 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c22b37e402 
							
						 
					 
					
						
						
							
							latest work on db migration  
						
						 
						
						
						
						
					 
					
						2011-02-22 18:23:05 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							6b0d4947ed 
							
						 
					 
					
						
						
							
							bug 8529: propagated to master.  Added junit test support to ant  
						
						 
						
						
						
						
					 
					
						2011-02-16 17:40:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							9e0f57bc0e 
							
						 
					 
					
						
						
							
							change code for new UI  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:40:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							d72e0538da 
							
						 
					 
					
						
						
							
							Revert "Revert "use iso to patch systemvm""  
						
						 
						
						... 
						
						
						
						This reverts commit 145e2e0aaa9b57286102664787e8e40ad3d75e26. 
						
						
					 
					
						2010-08-26 16:06:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							145e2e0aaa 
							
						 
					 
					
						
						
							
							Revert "use iso to patch systemvm"  
						
						 
						
						... 
						
						
						
						This reverts commit 3565f8d21b331745b99ce3a09a35d642f2f7bcfe. 
						
						
					 
					
						2010-08-26 16:03:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							3565f8d21b 
							
						 
					 
					
						
						
							
							use iso to patch systemvm  
						
						 
						
						... 
						
						
						
						Conflicts:
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	scripts/vm/hypervisor/xenserver/xenserver56/patch 
						
						
					 
					
						2010-08-26 15:56:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							45cb68e7e2 
							
						 
					 
					
						
						
							
							add templates.vmware.sql  
						
						 
						
						... 
						
						
						
						modify build to deploy vmware database records 
						
						
					 
					
						2010-08-24 22:58:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c21bc7072c 
							
						 
					 
					
						
						
							
							more changes  
						
						 
						
						
						
						
					 
					
						2010-08-16 11:30:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							867b43dcf9 
							
						 
					 
					
						
						
							
							more changes for the rewrite.  
						
						 
						
						
						
						
					 
					
						2010-08-16 11:28:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Manuel Amador (Rudd-O) 
							
						 
					 
					
						
						
						
						
							
						
						
							05c020e1f6 
							
						 
					 
					
						
						
							
							Source code committed  
						
						 
						
						
						
						
					 
					
						2010-08-11 09:13:29 -07:00