etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/plugins/hypervisors
History
Daan Hoogland 148efbb73f Merge remote-tracking branch 'origin/4.5' into merge-master 
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	setup/db/db/schema-441to450.sql
	test/integration/component/test_deploy_vgpu_vm.py
	tools/marvin/marvin/config/test_data.py
 		2014-10-16 12:29:37 +02:00
..
baremetal Merge remote-tracking branch 'origin/4.5' into merge-master 2014-10-16 12:29:37 +02:00
hyperv CLOUDSTACK-7494. Migration of a vm fails on Hyper-V. In an earlier commit as part of 2014-10-12 23:40:37 -04:00
kvm Fixed few coverity issues 2014-10-14 17:16:50 +05:30
ovm Fixed few coverity issues 2014-10-14 17:16:50 +05:30
simulator Improve the handling of the findbug exclude files 2014-09-03 10:41:22 +02:00
ucs Improve the handling of the findbug exclude files 2014-09-03 10:41:22 +02:00
vmware Fixed few coverity issues 2014-10-14 17:16:50 +05:30
xenserver CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect 2014-10-14 17:55:37 +05:30