From a0f1701f9a8991544d7ca9f76c68293b58d6a18d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tino=20V=C3=A1zquez?= Date: Thu, 12 May 2011 15:36:24 +0200 Subject: [PATCH 1/2] README.md should point to dev version in master branch --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ddd0e2410b..2480dac71f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ distributed data center infrastructures. Complete documentation can be found at - http://opennebula.org/documentation:rel2.0 + http://opennebula.org/documentation:rel2.4 ## INSTALLATION @@ -111,7 +111,7 @@ where **install_options** can be one or more of: ## CONFIGURATION -Information on how to configure OpenNebula is located at http://opennebula.org/documentation:rel2.0 +Information on how to configure OpenNebula is located at http://opennebula.org/documentation:rel2.4 ## CONTACT From ca379d4af8bb38c6526ab99fb5f8008bc8809583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tino=20V=C3=A1zquez?= Date: Thu, 12 May 2011 16:04:12 +0200 Subject: [PATCH 2/2] bug #611: No default disk driver hardcoded to fix compatiblity with VMware Server. --- src/vmm/LibVirtDriverVMware.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/vmm/LibVirtDriverVMware.cc b/src/vmm/LibVirtDriverVMware.cc index ade02db1b5..ffe9f14cae 100644 --- a/src/vmm/LibVirtDriverVMware.cc +++ b/src/vmm/LibVirtDriverVMware.cc @@ -166,11 +166,6 @@ int LibVirtDriver::deployment_description_vmware( get_default("DISK","DRIVER",default_driver); - if (default_driver.empty()) - { - default_driver = "raw"; - } - num = vm->get_template_attribute("DISK",attrs); if (num!=0) @@ -252,7 +247,10 @@ int LibVirtDriver::deployment_description_vmware( } else { - file << default_driver << "'/>" << endl; + if (!default_driver.empty()) + { + file << default_driver << "'/>" << endl; + } } if (readonly)