summaryrefslogtreecommitdiffstats
path: root/nova/utils.py
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-06-03 13:32:42 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-06-03 13:32:42 -0700
commitb1fb63713e592f8d7e8406287ce77e345d2ad30f (patch)
tree0b2200302c745424e6f19d6a7f8026e9c9859113 /nova/utils.py
parentcc7aec17929414c58bbfdde609930e66e6f17028 (diff)
parent05eb0abdbfcab6c0f96feb8828439204cbdd3960 (diff)
trunk merge after 2b hit
Diffstat (limited to 'nova/utils.py')
-rw-r--r--nova/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/utils.py b/nova/utils.py
index 361fc9873..b1638e72c 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -307,7 +307,7 @@ def get_my_linklocal(interface):
def utcnow():
- """Overridable version of datetime.datetime.utcnow."""
+ """Overridable version of utils.utcnow."""
if utcnow.override_time:
return utcnow.override_time
return datetime.datetime.utcnow()