Kris McQueen 8e086d7a21 resolving merge conflicts between 2.1.refactor and master		2010-10-12 16:28:16 -07:00
..
AgentBasedConsoleProxyManager.java	resolving merge conflicts between 2.1.refactor and master	2010-10-12 16:28:16 -07:00
AgentBasedStandaloneConsoleProxyManager.java	bug 5191: incremental checkin	2010-09-27 11:10:55 -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	resolving merge conflicts between 2.1.refactor and master	2010-10-12 16:28:16 -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	resolving merge conflicts between 2.1.refactor and master	2010-10-12 16:28:16 -07:00
StaticConsoleProxyManager.java	final merge of master->2.1.refactor preparing for merge back into master	2010-10-12 14:46:24 -07:00