summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-25 23:01:37 +0000
committerGerrit Code Review <review@openstack.org>2012-01-25 23:01:37 +0000
commit9e9d271fe876b0231e947a14d8c2cee8ecc706da (patch)
tree7440688dba469880dcf2babab10af9c100639b2a /nova/api
parent07eebdfdef069945d04cf6ca1bb45a68ea32766b (diff)
parent093c147a14059c60e6b787589398ee7d8f9792d9 (diff)
Merge "Fix uptime calculation in simple_usage"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/contrib/simple_tenant_usage.py2
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 8e4201546..576f37fd8 100644
--- a/nova/api/openstack/compute/contrib/simple_tenant_usage.py
+++ b/nova/api/openstack/compute/contrib/simple_tenant_usage.py
@@ -159,7 +159,7 @@ class SimpleTenantUsageController(object):
else:
delta = now - info['started_at']
- info['uptime'] = delta.days * 24 * 60 + delta.seconds
+ info['uptime'] = delta.days * 24 * 3600 + delta.seconds
if not info['tenant_id'] in rval:
summary = {}