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
Chiradeep Vittal cadca5fc0c Merge branch 'master' into network-refactor-merge2 
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
	server/src/com/cloud/acl/DomainChecker.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
 		2013-01-16 19:17:14 -08:00
..
AgentBasedConsoleProxyManager.java add recreate.systemvm.enabled parameter to control recreating systemvm 2012-08-20 11:19:26 -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 network-refactor-merge2 2013-01-16 19:17:14 -08:00
StaticConsoleProxyManager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00