frank 6aaf3d5ae0 Merge branch 'cvm' ...

Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/storage/Storage.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java

2011-08-08 14:14:09 -07:00

..

src/com/cloud

Merge branch 'cvm'

2011-08-08 14:14:09 -07:00

test/com/cloud/agent/transport

bug 10737: Fix java.nio.BufferOverflowException in decompression

2011-07-15 18:22:25 -07:00

.classpath

better way to log the agent request and response. Introduced the idea of via agents in the request header

2011-05-17 16:02:44 -07:00

.project

revert un neccessary changes

2010-09-29 18:40:52 -07:00