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 
							
						 
					 
					
						
						
						
						
							
						
						
							cd929e69fa 
							
						 
					 
					
						
						
							
							correct ant build-apidoc  
						
						 
						
						... 
						
						
						
						use right script path 
						
						
					 
					
						2011-10-18 14:40:28 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							797d5ff9a7 
							
						 
					 
					
						
						
							
							add usage back to spec file  
						
						 
						
						... 
						
						
						
						now FOSS including all stuff 
						
						
					 
					
						2011-09-14 14:59:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2dcdb946d2 
							
						 
					 
					
						
						
							
							fix wrong unittest  
						
						 
						
						
						
						
					 
					
						2011-09-13 11:22:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							254fa22cc7 
							
						 
					 
					
						
						
							
							fix the broken system VM build after renaming of some third-party libraries  
						
						 
						
						
						
						
					 
					
						2011-09-06 16:10:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							f7924505d3 
							
						 
					 
					
						
						
							
							partly bring usage back to spec file to work around rpm build  
						
						 
						
						
						
						
					 
					
						2011-08-31 17:25:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							81c376dd5b 
							
						 
					 
					
						
						
							
							updating copyright licenses, including build-usage.xml  
						
						 
						
						
						
						
					 
					
						2011-08-31 16:22:51 -04: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							0b010ef9d4 
							
						 
					 
					
						
						
							
							put comipiling jar files to deps.classpath  
						
						 
						
						
						
						
					 
					
						2011-08-30 13:58:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							c9e78299d0 
							
						 
					 
					
						
						
							
							add compiling time classpath for testclient target  
						
						 
						
						
						
						
					 
					
						2011-08-30 11:03:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							bb1b16c540 
							
						 
					 
					
						
						
							
							merge thridparty to deps  
						
						 
						
						
						
						
					 
					
						2011-08-25 14:32:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							6d6cc2ca54 
							
						 
					 
					
						
						
							
							Developer build fix after premium-move to FOSS  
						
						 
						
						
						
						
					 
					
						2011-08-25 10:19:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							d36a988d84 
							
						 
					 
					
						
						
							
							move simulator/test to opensource  
						
						 
						
						
						
						
					 
					
						2011-08-24 10:37:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							b3478c377e 
							
						 
					 
					
						
						
							
							Full opensource  
						
						 
						
						
						
						
					 
					
						2011-08-23 19:52:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							4f8a52f94c 
							
						 
					 
					
						
						
							
							Move VMware/Premium Secondary storage VM to opensource  
						
						 
						
						
						
						
					 
					
						2011-08-23 14:43:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							0be1510496 
							
						 
					 
					
						
						
							
							add template for simulator  
						
						 
						
						
						
						
					 
					
						2011-08-16 10:30:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							d902d313b7 
							
						 
					 
					
						
						
							
							fixed a template creation bug  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/storage/StorageManager.java 
						
						
					 
					
						2011-06-28 19:17:34 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							87569452e7 
							
						 
					 
					
						
						
							
							hopefully the last of libre cleanup  
						
						 
						
						
						
						
					 
					
						2011-06-04 14:44:21 -04: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							303e2a7481 
							
						 
					 
					
						
						
							
							Start of zonesfeature / mycloud/cloudkit  
						
						 
						
						
						
						
					 
					
						2011-05-03 10:40:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							cf114fc7af 
							
						 
					 
					
						
						
							
							Enable SSL for mgmt servers and agents  
						
						 
						
						... 
						
						
						
						The port remains 8250.
The keystore saved at /etc/cloud/management/cloud.keystore. We also include one
fail-safe keystore/certificate for fallback if we are unable to generate
certificate and keystore. If we use fail-safe keystore, a warning and calltrace would be show.
Notice you need to upgrade agent, as well as systemVM's images. 
						
						
					 
					
						2011-04-28 17:41:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Frank 
							
						 
					 
					
						
						
						
						
							
						
						
							92155522f2 
							
						 
					 
					
						
						
							
							Add license header to files  
						
						 
						
						
						
						
					 
					
						2011-04-14 11:23:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Frank 
							
						 
					 
					
						
						
						
						
							
						
						
							105db3b15a 
							
						 
					 
					
						
						
							
							Merge branch 'baremetal' to master  
						
						 
						
						... 
						
						
						
						modifies:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/commands/AddHostCmd.java
	api/src/com/cloud/api/commands/CreatePodCmd.java
	api/src/com/cloud/api/commands/DeployVMCmd.java
	api/src/com/cloud/dc/Pod.java
	api/src/com/cloud/network/NetworkService.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/dc/HostPodVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	setup/db/create-schema.sql
	utils/src/com/cloud/utils/SerialVersionUID.java 
						
						
					 
					
						2011-04-11 14:21:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Frank 
							
						 
					 
					
						
						
						
						
							
						
						
							5819e8fee0 
							
						 
					 
					
						
						
							
							Bug 8208 - bare metal provisioning  
						
						 
						
						... 
						
						
						
						Work with PING 
						
						
					 
					
						2011-04-04 19:19:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							fa98eda410 
							
						 
					 
					
						
						
							
							fixing typo in check for usage server init script  
						
						 
						
						
						
						
					 
					
						2011-03-25 14:42:06 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							82f7504832 
							
						 
					 
					
						
						
							
							checking in the upgrade stuff for now  
						
						 
						
						
						
						
					 
					
						2011-03-19 09:27:10 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							b8e03aca4c 
							
						 
					 
					
						
						
							
							script fix  
						
						 
						
						
						
						
					 
					
						2011-03-07 19:47:29 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							925f415c4b 
							
						 
					 
					
						
						
							
							change deploy path to /usr/local/cloud for simulator  
						
						 
						
						
						
						
					 
					
						2011-02-23 13:27:34 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							fa96deec28 
							
						 
					 
					
						
						
							
							Make secondary storage VM support premium version and opensource version  
						
						 
						
						
						
						
					 
					
						2011-02-18 17:10:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							6b0d4947ed 
							
						 
					 
					
						
						
							
							bug 8529: propagated to master.  Added junit test support to ant  
						
						 
						
						
						
						
					 
					
						2011-02-16 17:40:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Frank 
							
						 
					 
					
						
						
						
						
							
						
						
							0fe9322895 
							
						 
					 
					
						
						
							
							fix systemvm start failure casued by missing files  
						
						 
						
						
						
						
					 
					
						2011-01-31 18:46:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Frank 
							
						 
					 
					
						
						
						
						
							
						
						
							cbb54c549e 
							
						 
					 
					
						
						
							
							don't filter fsimage.so  
						
						 
						
						
						
						
					 
					
						2011-01-31 16:18:57 -08:00