gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-11 00:24:24 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
46dac852fa
cloudstack-mirror/server
History
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
..
conf Removed bad word from log4j config files. 2011-02-08 13:55:40 -08:00
scripts Source code committed 2010-08-11 09:13:29 -07:00
src/com/cloud Merge branch 'swift' 2011-10-31 15:04:48 -07:00
test Merge branch 'swift' 2011-10-31 15:04:48 -07:00
.classpath Merge branch 'swift' 2011-10-31 15:04:48 -07:00
.project Fix corrupted eclipse project settings, schema fixes and updated template download url 2010-09-29 18:41:54 -07:00