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

..

resources/META-INF/cloudstack

Removed "host" config parameter definition from ClusterManager interface as it got moved to cloud-api package

2014-01-21 17:19:52 -08:00

src

Merge remote-tracking branch 'origin/4.5' into merge-master

2014-10-16 12:29:37 +02:00

test

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

pom.xml

api: fix refactored ApiServerService interface to api

2014-08-28 19:45:22 +02:00