cloudstack/server/src/com/cloud/host/dao
frank 6aaf3d5ae0 Merge branch 'cvm'
Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/storage/Storage.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-08 14:14:09 -07:00
..
HostDao.java Merge branch 'cvm' 2011-08-08 14:14:09 -07:00
HostDaoImpl.java Merge branch 'cvm' 2011-08-08 14:14:09 -07:00
HostDetailsDao.java Separated resource management and agent management code. It's not all done but at least we make a first step 2011-05-16 10:55:18 -07:00
HostDetailsDaoImpl.java Separated resource management and agent management code. It's not all done but at least we make a first step 2011-05-16 10:55:18 -07:00
HostTagsDao.java Add license header to files 2011-04-14 11:23:14 -07:00
HostTagsDaoImpl.java Bug 7845 - Productize DeploymentPlanner 2011-02-28 13:47:51 -08:00