summaryrefslogtreecommitdiffstats
path: root/nova/notifications.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-06-18 17:02:19 +0000
committerGerrit Code Review <review@openstack.org>2012-06-18 17:02:19 +0000
commit5bfa8a70e8b11f68deb101c872eace27d7a3b1b4 (patch)
tree9c298941f50a7b080518efc53016ec89426496a3 /nova/notifications.py
parent60ea96b288d9d8f29d772dce3763fda466c73040 (diff)
parent9ff3121bd90133fb3b37c0e10407b5f7ade26b90 (diff)
downloadnova-5bfa8a70e8b11f68deb101c872eace27d7a3b1b4.tar.gz
nova-5bfa8a70e8b11f68deb101c872eace27d7a3b1b4.tar.xz
nova-5bfa8a70e8b11f68deb101c872eace27d7a3b1b4.zip
Merge "Replaces functions in utils.py with openstack/common/timeutils.py"
Diffstat (limited to 'nova/notifications.py')
-rw-r--r--nova/notifications.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/notifications.py b/nova/notifications.py
index e83098b20..05c1f7237 100644
--- a/nova/notifications.py
+++ b/nova/notifications.py
@@ -28,6 +28,7 @@ from nova import network
from nova.network import model as network_model
from nova.notifier import api as notifier_api
from nova.openstack.common import cfg
+from nova.openstack.common import timeutils
from nova import utils
LOG = log.getLogger(__name__)
@@ -140,7 +141,7 @@ def audit_period_bounds(current_period=False):
begin, end = utils.last_completed_audit_period()
if current_period:
audit_start = end
- audit_end = utils.utcnow()
+ audit_end = timeutils.utcnow()
else:
audit_start = begin
audit_end = end