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
..
component	Merge remote-tracking branch 'origin/4.5' into merge-master	2014-10-16 12:29:37 +02:00
smoke	CLOUDSTACK-7646: test_nuage_vsp.py - Fixed basic indentation issues, list index issues, marked it as invalid because the test cases needs attention by the original author as it does not pass even after fixing the issues. Also moving it to smoke folder as clearly it is a Basic Validation test	2014-10-13 00:33:06 -04:00
testpaths	CLOUDSTACK-7632:Automation for volume life cycle testPath	2014-10-13 00:34:54 -04:00
__init__.py	apply chip childers licensing patches for the test directory	2012-06-26 11:19:58 -04:00