summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-05-15 07:05:04 +0000
committerGerrit Code Review <review@openstack.org>2012-05-15 07:05:04 +0000
commit3c9c38a8e08dd0300a04edb843a0b3e49486e86f (patch)
tree4f3e9ef6d9ebe3e06ce01fed377483fd46bd2b0a
parent4c8a101dcb2a61b5c2c1946bf286ad204bbdea68 (diff)
parent2e912f4b91b57c060c2363c067125276a92457d2 (diff)
downloadkeystone-3c9c38a8e08dd0300a04edb843a0b3e49486e86f.tar.gz
keystone-3c9c38a8e08dd0300a04edb843a0b3e49486e86f.tar.xz
keystone-3c9c38a8e08dd0300a04edb843a0b3e49486e86f.zip
Merge "Flush tenant membership deletion before user"
-rw-r--r--keystone/identity/backends/sql.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/keystone/identity/backends/sql.py b/keystone/identity/backends/sql.py
index 18b333fa..d3f5d952 100644
--- a/keystone/identity/backends/sql.py
+++ b/keystone/identity/backends/sql.py
@@ -338,6 +338,7 @@ class Identity(sql.Base, identity.Driver):
if membership_refs:
for membership_ref in membership_refs:
session.delete(membership_ref)
+ session.flush()
if metadata_refs:
for metadata_ref in metadata_refs:
session.delete(metadata_ref)