From 46c329739bf13ed9ba9febfe7cc34988ec0ca9fa Mon Sep 17 00:00:00 2001
From: Gregory Nagy <ngergo@ik.bme.hu>
Date: Mon, 17 Feb 2014 13:57:38 +0100
Subject: [PATCH] Merge fxd
---
circle/manager/scheduler.py | 8 --------
1 file changed, 8 deletions(-)
diff --git a/circle/manager/scheduler.py b/circle/manager/scheduler.py
index 6e5af5a..4e0ffdc 100644
--- a/circle/manager/scheduler.py
+++ b/circle/manager/scheduler.py
@@ -50,13 +50,9 @@ def has_enough_ram(ram_size, node):
"""True, if the node has enough memory to accomodate a guest requiring
ram_size mebibytes of memory; otherwise, false.
"""
-<<<<<<< HEAD
total = node.ram_size
used = (node.ram_usage() / 100) * total
unused = total - used
-=======
- unused = node.ram_size * (1 - node.ram_usage)
->>>>>>> e17952087c648c91908f22e85c4db7194c5f8f60
overcommit = node.ram_size_with_overcommit
reserved = node.instance_set.aggregate(r=Sum('ram_size'))['r'] or 0
@@ -70,11 +66,7 @@ def free_cpu_time(node):
Higher values indicate more idle time.
"""
-<<<<<<< HEAD
activity = node.cpu_usage() / 100
-=======
- activity = node.cpu_usage
->>>>>>> e17952087c648c91908f22e85c4db7194c5f8f60
inactivity = 1 - activity
cores = node.num_cores
return cores * inactivity
--
libgit2 0.26.0