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
..
2011-06-17 10:51:59 -07:00
2011-06-15 14:55:35 -07:00
2011-03-25 14:30:13 -07:00
2011-07-21 10:29:07 -07:00
2011-02-03 12:04:04 -08:00
2011-06-15 14:55:35 -07:00
2011-06-17 10:51:59 -07:00
2011-06-15 14:55:35 -07:00
2011-02-01 18:09:42 -08:00
2011-07-22 15:45:26 -07:00
2011-05-31 15:59:17 -07:00
2011-07-29 11:25:35 -07:00
2011-07-26 10:21:10 -07:00
2011-06-27 14:33:00 -07:00
2011-07-25 10:25:24 -07:00
2011-08-01 12:44:37 -07:00
2011-06-15 18:14:52 -07:00
2011-08-08 14:14:09 -07:00
2011-06-15 14:55:35 -07:00
2011-08-08 14:14:09 -07:00
2011-07-22 15:54:30 -07:00
2011-07-08 14:47:17 -07:00
2011-06-15 14:55:35 -07:00
2011-07-22 15:32:09 -07:00
2011-06-16 16:42:32 -07:00
2011-07-22 15:32:09 -07:00
2011-06-15 14:55:35 -07:00
2011-08-08 14:14:09 -07:00
2011-07-25 11:56:12 -07:00
2011-08-08 14:14:09 -07:00
2010-11-01 21:43:37 -07:00
2011-04-14 11:23:14 -07:00
2010-11-01 21:43:37 -07:00
2010-11-02 18:29:11 -07:00
2010-11-01 21:43:37 -07:00
2010-11-01 21:43:37 -07:00
2010-12-15 17:54:49 -08:00
2010-11-01 21:43:37 -07:00