Merge branch 'one-3.6' of git.opennebula.org:one into one-3.6

This commit is contained in:
Ruben S. Montero committed 2012-07-03 16:29:02 +02:00
commit c23f86b21c
1 file changed
+1 -1
+1 -1
View File
@@ -90,7 +90,7 @@ class DummyDriver < VirtualMachineDriver
max_memory = 256
if msg.elements["VM/TEMPLATE/MEMORY"]
max_memory = msg.elements["VM/TEMPLATE/MEMORY"].text.to_i
max_memory = msg.elements["VM/TEMPLATE/MEMORY"].text.to_i * 1024
end
max_cpu = 100