frank 18f87c2108 Merge branch 'cvm' into 2.2.y ... Conflicts: api/src/com/cloud/api/BaseCmd.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/network/security/SecurityGroupListener.java server/src/com/cloud/storage/StorageManagerImpl.java server/src/com/cloud/storage/listener/StoragePoolMonitor.java server/src/com/cloud/vm/UserVmManagerImpl.java server/src/com/cloud/vm/VirtualMachineManagerImpl.java utils/src/com/cloud/utils/SerialVersionUID.java		2011-08-19 16:08:35 -07:00
..
AgentBasedConsoleProxyManager.java	changed getName to getHostname	2011-04-29 08:34:10 -07:00
AgentBasedStandaloneConsoleProxyManager.java	bug 5191: incremental checkin	2010-09-27 11:10:55 -07:00
AgentHook.java	Add console proxy management state, support certificate upload, all done except UI	2011-04-21 18:46:37 -07:00
ConsoleProxyAlertEventArgs.java	moving console proxy alert event args to server package to avoid circular dependencies	2010-09-13 14:58:58 -07:00
ConsoleProxyBalanceAllocator.java	bug 10732: fix console proxy assignment issue - file was not saved, commit again	2011-07-14 21:56:51 -07:00
ConsoleProxyListener.java	Merge branch 'cvm' into 2.2.y	2011-08-19 16:08:35 -07:00
ConsoleProxyManagementState.java	Add console proxy management state, support certificate upload, all done except UI	2011-04-21 18:46:37 -07:00
ConsoleProxyManager.java	Add console proxy management state, support certificate upload, all done except UI	2011-04-21 18:46:37 -07:00
ConsoleProxyManagerImpl.java	bug 11014:	2011-08-08 18:28:34 -07:00
StaticConsoleProxyManager.java	bug 10126: Renamed getPodId() to getPodIdToDeployIn()	2011-06-03 22:17:08 -07:00