diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-25 17:06:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-25 17:06:25 +0000 |
| commit | 93857585d6405cf034d1af0a79413166e05a879f (patch) | |
| tree | e633faa766ee5f290cb3ac4bf6a6d9bbe7e2df55 /nova/api | |
| parent | 2458449399cb765b336ff46f18517d4f026a3323 (diff) | |
| parent | 5aca2e2df66c124696589ed3d45aae218fe2c91e (diff) | |
| download | nova-93857585d6405cf034d1af0a79413166e05a879f.tar.gz nova-93857585d6405cf034d1af0a79413166e05a879f.tar.xz nova-93857585d6405cf034d1af0a79413166e05a879f.zip | |
Merge "Use utils.utcnow rather than datetime.utcnow"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/simple_tenant_usage.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/simple_tenant_usage.py b/nova/api/openstack/compute/contrib/simple_tenant_usage.py index eb8f86cc8..7914a1dd3 100644 --- a/nova/api/openstack/compute/contrib/simple_tenant_usage.py +++ b/nova/api/openstack/compute/contrib/simple_tenant_usage.py @@ -152,7 +152,7 @@ class SimpleTenantUsageController(object): else: info['state'] = instance['vm_state'] - now = datetime.datetime.utcnow() + now = utils.utcnow() if info['state'] == 'terminated': delta = info['ended_at'] - info['started_at'] |