cloudstack/server/src/com/cloud/hypervisor
anthony 46dac852fa Merge branch 'swift'
Conflicts:
	server/src/com/cloud/agent/AgentManager.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2011-10-31 15:04:48 -07:00
..
dao Bug 11200 - maximum number of guests per host 2011-09-08 18:08:31 -07:00
guru Merge branch 'swift' 2011-10-31 15:04:48 -07:00
hyperv Bug 11522 - New agent manager 2011-10-06 11:56:17 -07:00
kvm/discoverer Bug 11522 - New agent manager 2011-10-06 11:56:17 -07:00
vmware Merge branch 'newagentmgr' 2011-10-27 11:09:56 -07:00
xen/discoverer Merge branch 'newagentmgr' 2011-10-27 11:09:56 -07:00
CloudZonesStartupProcessor.java Bug 11522 - New agent manager 2011-09-26 16:55:20 -07:00
HypervisorGuruBase.java bug 10765: fix step 2 - programming VNC server to let it chose the right keyboard mapping to load into 2011-08-04 18:30:50 -07:00
HypervisorGuruManager.java Add license header to files 2011-04-14 11:23:14 -07:00
HypervisorGuruManagerImpl.java Add license header to files 2011-04-14 11:23:14 -07:00
KVMGuru.java 1) Remove customer field applied to virtual machine in VMware. 2) always track VM host change in VMware regardless whether or not native HA is enabled 2011-06-16 16:22:11 -07:00
XenServerGuru.java bug 10588: making sure the vms are synced during a delta also 2011-10-27 15:56:53 +05:30