Merged with conflict and resolved conflict (with my own patch, no less)

1 files changed, 8 insertions, 0 deletions

diff --git a/nova/utils.py b/nova/utils.py
index 352c5d9f9..e4d8a70eb 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -335,6 +335,14 @@ def utcnow():
 utcnow.override_time = None
 
 
+def is_older_than(before, seconds):
+    """Return True if before is older than 'seconds'"""
+    if utcnow() - before > datetime.timedelta(seconds=seconds):
+        return True
+    else:
+        return False
+
+
 def utcnow_ts():
     """Timestamp version of our utcnow function."""
     return time.mktime(utcnow().timetuple())