summaryrefslogtreecommitdiffstats
path: root/nova/utils.py
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-06-06 11:41:04 -0400
committerAlex Meade <alex.meade@rackspace.com>2011-06-06 11:41:04 -0400
commit5c8b2707b11a3b4a0a2dedfdbf2792c846ce53c0 (patch)
treebff91a0af440f5b593e94c6325793987c2ad5a58 /nova/utils.py
parent3d481e551ac81a35cafcd79c2b17d2bd9c8a050f (diff)
parent54731d1b357ae7527f91b01d17664528aa48c61b (diff)
downloadnova-5c8b2707b11a3b4a0a2dedfdbf2792c846ce53c0.tar.gz
nova-5c8b2707b11a3b4a0a2dedfdbf2792c846ce53c0.tar.xz
nova-5c8b2707b11a3b4a0a2dedfdbf2792c846ce53c0.zip
merge trunk
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 4e1b7c26a..e77c80262 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -309,7 +309,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()