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

..

com/cloud

1) replaced joinProject API with updateProjectInvitation api. You can accept/decline the invitataion with this command

2011-10-27 18:32:00 -07:00

async-job-component.xml

Swift : bug fix

2011-10-27 16:04:18 -07:00

sync-queue-component.xml

Bug 7409: Implement forcely-cancelling mechenism for jobs that have been staying in queue for too long

2011-01-05 15:44:10 -08:00