alena 671ec62358 bug 9623: set ha_enable to false for consoleProxy vms and service_offering. ... status 9623: resolved fixed Also set ram_size to 1024 for console proxy offering during the upgrade Conflicts: core/src/com/cloud/vm/SecondaryStorageVmVO.java server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java		2011-04-29 11:53:07 -07:00
..
bindir	Additions made to the script inorder to avoid VM login using "saved_password" string	2011-03-09 15:54:18 -08:00
db	bug 9623: set ha_enable to false for consoleProxy vms and service_offering.	2011-04-29 11:53:07 -07:00
.project	Branch 2.1.refactor committed	2010-08-11 09:13:42 -07:00