Comment 5 for bug 1296333

Reviewed: https://review.openstack.org/82367
Committed: https://git.openstack.org/cgit/openstack/keystone/commit/?id=3d2a715025af1ff64cba3691d876bb92b22c0bfa
Submitter: Jenkins
Branch: master

commit 3d2a715025af1ff64cba3691d876bb92b22c0bfa
Author: Brant Knudson <email address hidden>
Date: Sun Mar 23 11:55:59 2014 -0500

    Fix doc build errors with SQLAlchemy 0.9

    The docs failed to build when using SQLAlchemy 0.9. The following
    errors occur:

     sphinx.errors.SphinxWarning:
     /opt/stack/keystone/keystone/common/sql/__init__.py:docstring of
     keystone.common.sql.relationship:53: ERROR: Unknown interpreted text
     role "paramref".

    To fix this, relationship was removed from keystone.common.sql. It
    was a reference to the same in sqlalchemy.orm, so the user was
    changed to use sqlalchemy.orm.relationship.

     sphinx.errors.SphinxWarning:
     /opt/stack/keystone/keystone/openstack/common/db/sqlalchemy/utils.py:
     docstring of keystone.openstack.common.db.sqlalchemy.utils.or_:26:
     WARNING: more than one target found for cross-reference u'and_':
     keystone.common.sql.core.and_, keystone.common.sql.and_

    To fix this, and_ was removed from keystone.common.sql. It was a
    reference to the same in sqlalchemy, so the users were changed to use
    sqlalchemy.and_.

    Closes-Bug: #1296333
    Change-Id: I39a91a5a30d351c4538d437c7584544bdb59c65e