cloudstack/setup
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
..
apidoc correct ant build-apidoc 2011-10-18 14:40:28 -07:00
bindir 1) More logging to cloud-sysvmadm script - to give the user better details on which domR is being restarted at the moment 2011-09-06 16:11:17 -07:00
db Merge branch 'swift' 2011-10-31 15:04:48 -07:00
.project Branch 2.1.refactor committed 2010-08-11 09:13:42 -07:00