Merge "Tolerate new SQLAlchemy==1.1.7"

This commit is contained in:
Jenkins 2017-03-28 18:50:50 +00:00 committed by Gerrit Code Review
commit 56ac735910
1 changed files with 1 additions and 1 deletions

View File

@ -284,7 +284,7 @@ def model_query(context, model, *args, **kwargs):
_("Unrecognized read_deleted value '%s'") % read_deleted)
if project_only and is_user_context(context):
if model == models.VolumeAttachment:
if model is models.VolumeAttachment:
# NOTE(dulek): In case of VolumeAttachment, we need to join
# `project_id` through `volume` relationship.
query = query.filter(models.Volume.project_id ==