alena 22ee7117f5 bug 9521: fixed NPE in finalizeCommandsOnStart() method by adding vm's nic to vm profile during the vm to vmProfile conversion. ... status 9521: resolved fixed Conflicts: server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java server/src/com/cloud/vm/VirtualMachineManagerImpl.java		2011-04-20 16:16:01 -07:00
..
LocalSecondaryStorageResource.java	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
SecStorageVmAlertEventArgs.java	Moved DAO to server	2010-11-22 07:40:41 -08:00
SecondaryStorageDiscoverer.java	When secondary storage is not running inside SSVM, let FOSS SecondaryStorageDiscoverer be able to dynamically load premium version of the secondary storage resource	2011-02-22 15:39:22 -08:00
SecondaryStorageListener.java	bug 8713: supporting structures for SSVM load management	2011-03-29 18:52:54 -07:00
SecondaryStorageManagerImpl.java	bug 9521: fixed NPE in finalizeCommandsOnStart() method by adding vm's nic to vm profile during the vm to vmProfile conversion.	2011-04-20 16:16:01 -07:00
SecondaryStorageVmAllocator.java	Moved DAO to server	2010-11-22 07:40:41 -08:00
SecondaryStorageVmDefaultAllocator.java	cleaning up imports, fixing up some compilation problems related to API refactoring	2010-09-13 15:25:46 -07:00
SecondaryStorageVmManager.java	bug 8713 : finalize the implementation of supporting system vm pooling	2011-03-31 17:14:09 -07:00