etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/src/com/cloud/consoleproxy
History
Alena Prokharchyk a39fd61249 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java
 		2012-07-27 13:47:46 -07:00
..
AgentBasedConsoleProxyManager.java Merge branch 'master' into vpc 2012-07-27 13:47:46 -07:00
AgentBasedStandaloneConsoleProxyManager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
AgentHook.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ConsoleProxyAlertEventArgs.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ConsoleProxyBalanceAllocator.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ConsoleProxyListener.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ConsoleProxyManagementState.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ConsoleProxyManager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ConsoleProxyManagerImpl.java Merge branch 'master' into vpc 2012-07-27 13:47:46 -07:00
StaticConsoleProxyManager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00