summaryrefslogtreecommitdiffstats
path: root/nova/utils.py
diff options
context:
space:
mode:
authorSoren Hansen <soren.hansen@rackspace.com>2010-11-22 22:27:15 +0100
committerSoren Hansen <soren.hansen@rackspace.com>2010-11-22 22:27:15 +0100
commit33dd63eaa0fe32916dd15ec03943903ff2823bff (patch)
treec4f846a16713490af29308145c4430450bc5f92e /nova/utils.py
parent3b695e11da34247123ea919e71096e53393f227b (diff)
parent4730b2037d4b53cd79c7d46965c5cafa1912c812 (diff)
downloadnova-33dd63eaa0fe32916dd15ec03943903ff2823bff.tar.gz
nova-33dd63eaa0fe32916dd15ec03943903ff2823bff.tar.xz
nova-33dd63eaa0fe32916dd15ec03943903ff2823bff.zip
Merge with trunk.
Diffstat (limited to 'nova/utils.py')
-rw-r--r--nova/utils.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/utils.py b/nova/utils.py
index b63237c10..820d5bb8a 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -21,6 +21,7 @@ System-level utilities and helper functions.
"""
import datetime
+import functools
import inspect
import logging
import os