Rohit Yadav db665fa8df Merge remote-tracking branch 'origin/4.14' ...

Conflicts:
	engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

2020-08-05 14:46:13 +05:30

..

baremetal

server: Enable sending hypervior host name via metadata - VR and Config Drive (#3976)

2020-07-01 08:44:11 +05:30

hyperv

Updating pom.xml version numbers for release 4.15.0.0-SNAPSHOT

2020-05-23 10:18:39 +01:00

kvm

kvm: For ceph only if a port number has been specified define in the XML (#4231)

2020-08-05 13:44:40 +05:30

ovm

Updating pom.xml version numbers for release 4.15.0.0-SNAPSHOT

2020-05-23 10:18:39 +01:00

ovm3

Updating pom.xml version numbers for release 4.15.0.0-SNAPSHOT

2020-05-23 10:18:39 +01:00

simulator

Updating pom.xml version numbers for release 4.15.0.0-SNAPSHOT

2020-05-23 10:18:39 +01:00

ucs

Updating pom.xml version numbers for release 4.15.0.0-SNAPSHOT

2020-05-23 10:18:39 +01:00

vmware

Merge remote-tracking branch 'origin/4.14'

2020-08-05 14:46:13 +05:30

xenserver

Merge remote-tracking branch 'origin/4.14'

2020-06-23 12:28:42 +05:30