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/hypervisor
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
..
dao CS-15631 : Support for up to 16 VDIs per VM on XS 6.0 and above 2012-08-01 19:39:30 +05:30
guru Patch from Chip Childers 2012-07-02 09:51:21 -04:00
hyperv Patch from Chip Childers 2012-07-02 09:51:21 -04:00
kvm/discoverer Network-refactor: Refactor NetworkManager into NetworkModel and NetworkManager. 2013-01-09 15:49:01 -08:00
CloudZonesStartupProcessor.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
HypervisorGuruBase.java default Security rule doesn't apply to system VMs since nic.getIsolationUri is not set 2013-01-15 11:15:42 -08:00
HypervisorGuruManager.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
HypervisorGuruManagerImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
KVMGuru.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00