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
..
main	Merge remote-tracking branch 'origin/4.14'	2020-08-05 14:46:13 +05:30
test/java	Boot into hardware setup menu on Vmware (#4021)	2020-06-11 11:47:20 +00:00