Kris McQueen 848ce60097 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
..
AgentBasedConsoleProxyManager.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
AgentBasedStandaloneConsoleProxyManager.java	renamed dao methods to correctly reflect what they do	2010-09-09 18:01:50 -07:00
AgentHook.java	bug 5764: More changes	2010-08-19 11:27:30 -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	cleaning up imports, fixing up some compilation problems related to API refactoring	2010-09-13 15:25:46 -07:00
ConsoleProxyListener.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
ConsoleProxyManager.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
ConsoleProxyManagerImpl.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
StaticConsoleProxyManager.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