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
..
2011-04-14 11:23:14 -07:00
2010-09-09 13:27:20 -07:00
2010-08-11 09:13:29 -07:00
2011-04-14 11:23:14 -07:00
2010-08-11 09:13:29 -07:00
2010-08-11 09:13:29 -07:00
2010-08-11 09:13:29 -07:00
2010-08-11 09:13:29 -07:00