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
..
bindirbak	apply chip childers licensing patches for the test directory	2012-06-26 11:19:58 -04:00
conf	Uniting all the READMEs from tools and test	2012-10-12 17:01:20 +05:30
integration	Merge remote-tracking branch 'origin/4.5' into merge-master	2014-10-16 12:29:37 +02:00
metadata	License header updates for the test folder.	2012-08-03 10:39:05 -04:00
scripts	CLOUDSTACK-28 wget.exe (GPLed) is present in the tools directory as a binary	2012-09-24 10:31:47 -04:00
selenium	CLOUDSTACK-6015: add user account, add user, login as new user, delete user, delete user account.	2014-03-28 06:21:59 -04:00
src/com/cloud	All Checkstyle problems corrected	2013-12-12 12:26:07 -08:00
pom.xml	Update master to 4.5.0-SNAPSHOT	2014-03-14 14:55:26 +01:00