cloudstack/ovm
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
..
scripts/vm/hypervisor/ovm Bug 11740 - OVM - after Primary storage OCFS2 with ISCSI path has been removed, attempt to add back same ISCSI path to Primary storage OCFS2 failed 2011-10-17 13:56:13 -07:00
src/com/cloud/ovm Merge branch 'swift' 2011-10-31 15:04:48 -07:00
.classpath fixed eclipse classpath 2011-08-31 13:35:37 -07:00
.project add classpath and project file for ovm 2011-08-30 15:59:39 -07:00