Rebase and fix bad change

diff --git a/exec/xenrt/config.py b/exec/xenrt/config.py
index 25261b8177519c9019825f427567f67e17518ea3..842233a9518c500e270339ed3822b7bbf1b6c447 100755 (executable)
--- a/exec/xenrt/config.py
+++ b/exec/xenrt/config.py
@@ -2534,7 +2534,7 @@ class Config(object):
         self.config["GUEST_LIMITATIONS"]["ubuntu1204"]["MAX_VM_VCPUS"] = "8"
         self.config["GUEST_LIMITATIONS"]["ubuntu1204"]["MAX_VM_VCPUS64"] = "64"
         self.config["GUEST_LIMITATIONS"]["ubuntu1404"] = {}
-        self.config["GUEST_LIMITATIONS"]["ubuntu1404"]["MINMEMORY"] = "512"
+        self.config["GUEST_LIMITATIONS"]["ubuntu1404"]["MINMEMORY"] = "256"
         self.config["GUEST_LIMITATIONS"]["ubuntu1404"]["STATICMINMEMORY"] = "512"
         self.config["GUEST_LIMITATIONS"]["ubuntu1404"]["MAXMEMORY"] = "32768"
         self.config["GUEST_LIMITATIONS"]["ubuntu1404"]["MAXMEMORY64"] = "131072"