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/vm
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 CLOUDSTACK-985: Revert "Using different MAC for a pair of redundant routers" 2013-01-15 15:02:21 -08:00
ClusteredVirtualMachineManagerImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ItWorkDao.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ItWorkDaoImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
ItWorkVO.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
NicVO.java api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
ReservationContextImpl.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
SystemVmLoadScanHandler.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
SystemVmLoadScanner.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
UserVmManager.java Move view based VO and Dao classes to cloud-server module to hide the 2012-12-14 10:47:58 -08:00
UserVmManagerImpl.java Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
UserVmStateListener.java Patch from Chip Childers 2012-07-02 09:51:21 -04:00
VirtualMachineGuru.java add recreate.systemvm.enabled parameter to control recreating systemvm 2012-08-20 11:19:26 -07:00
VirtualMachineManager.java Merge branch 'master' into vpc 2012-07-03 17:32:50 -07:00
VirtualMachineManagerImpl.java Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
VirtualMachineProfileImpl.java Replace db-id by UUID for user VM's vm-id. 2012-09-10 18:01:08 -07:00