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
..
conf	Summary: Updated sudoers approved commands for cloud user	2013-10-23 13:42:16 -07:00
resources	refactor all private methods in the virtual router appliance and VPC appliance	2014-10-14 15:08:09 +02:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	Merge remote-tracking branch 'origin/4.5' into merge-master	2014-10-16 12:29:37 +02:00
test	Merge remote-tracking branch 'origin/4.5' into merge-master	2014-10-16 12:29:37 +02:00
pom.xml	server: fix server package after auth plugin refactor	2014-08-28 19:45:23 +02:00