Alena Prokharchyk ce9f1afa78 Merge branch 'master' into vpc ... Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java		2012-08-01 19:04:28 -07: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	Patch fixes file names and imports wherever used, in files introduced in	2012-07-31 10:38:11 -07:00
CloudZonesStartupProcessor.java	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
HypervisorGuruBase.java	Merge branch 'master' into vpc	2012-07-13 13:52:58 -07: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