summaryrefslogtreecommitdiffstats
path: root/keystone/trust
diff options
context:
space:
mode:
authorMalini Bhandaru <malini.k.bhandaru@intel.com>2013-03-08 16:54:26 -0800
committerMalini Bhandaru <malini.k.bhandaru@intel.com>2013-03-08 16:54:59 -0800
commit806a2caa5ba825f5e2c1e91eb5a18029b3b5f76d (patch)
tree2f96b20f644ed6245f1b71896d19e8be1867709b /keystone/trust
parent756cd5a2972e076cdc9a119526e2038d0b838256 (diff)
downloadkeystone-806a2caa5ba825f5e2c1e91eb5a18029b3b5f76d.tar.gz
keystone-806a2caa5ba825f5e2c1e91eb5a18029b3b5f76d.tar.xz
keystone-806a2caa5ba825f5e2c1e91eb5a18029b3b5f76d.zip
bug 1133526
modify "expires" to "expires_at", most of the changes were already done by Guang-yee, added a pki-token-id test Change-Id: Ib3f39620db18aaea6b0cb5d0ae9c290afd870605
Diffstat (limited to 'keystone/trust')
-rw-r--r--keystone/trust/backends/sql.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/keystone/trust/backends/sql.py b/keystone/trust/backends/sql.py
index dc3644e3..cd68b0bc 100644
--- a/keystone/trust/backends/sql.py
+++ b/keystone/trust/backends/sql.py
@@ -81,7 +81,7 @@ class Trust(sql.Base, trust.Driver):
return None
if ref.expires_at is not None:
now = timeutils.utcnow()
- if now > ref.expires_at:
+ if now > ref.expires_at:
return None
trust_dict = ref.to_dict()