summaryrefslogtreecommitdiffstats
path: root/nova/utils.py
diff options
context:
space:
mode:
authorTrey Morris <trey.morris@rackspace.com>2011-06-03 13:34:54 -0500
committerTrey Morris <trey.morris@rackspace.com>2011-06-03 13:34:54 -0500
commit65e17925fc3dee9180fd0198475e4ffd7be2aa48 (patch)
tree049d3ee0934be84022ada50fe18928150699b3a3 /nova/utils.py
parent3db24f73cd5772537b9508304f8db8a7bb64f5ca (diff)
parent54c341feff5043a11cfccc6e2eb02b1bf0669348 (diff)
downloadnova-65e17925fc3dee9180fd0198475e4ffd7be2aa48.tar.gz
nova-65e17925fc3dee9180fd0198475e4ffd7be2aa48.tar.xz
nova-65e17925fc3dee9180fd0198475e4ffd7be2aa48.zip
merged trunk again
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 105d73c7c..b5aea54d0 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -299,7 +299,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()