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

commit 3e5fca06c6b7dd6060721faa39428b133edd10f0
Author: Boris Bobrov <email address hidden>
Date:   Tue Apr 5 18:50:48 2016 +0300

    Update federated user display name with shadow_users_api
    
    When a user comes to the cloud for the first time, a shadow user is
    created. When the user authenticates again, this shadow user is
    fetched and returned. Before it is returned, its display name should
    be updated. But the call to update the display name fails because
    neither identity manager nor identity drivers have the required
    method. However, the required method exists in shadow_users_api.
    
    The issue was hidden because method shadow_federated_user was
    cached and while the cache lived, the user could authenticate.
    
    Use the method of shadow_user_api instead of identity_api to update
    federated user display name.
    
    Change-Id: I58e65bdf3a953f3ded485003939b81f908738e1e
    Closes-Bug: 1566282
    (cherry picked from commit 7ad4f8728cce354617b5facefe5076d65af311c6)

commit dba04cdd232ab72704df58cff791d52c1c99bc90
Author: Morgan Fainberg <email address hidden>
Date:   Mon Mar 28 10:50:12 2016 -0700

    Correct `role_name` constraint dropping
    
    The `role_name` constraint was not properly dropped in some cases
    because the unique constraint was not consistently named. In all
    cases we must search for the constraint expected, not assume the
    name of the constraint will be consistent (especially from older
    installs that have been moved forward in releases).
    
    This change fixes migration 88, updates 96 (for backport to
    stable/mitaka) This is being overly cautious, but specifically
    is to handle the case where someone performed the upgrade and
    manually fixed the migration resulting in duplicated constraints
    in the role_table. Note that migration 100 was not backported since
    it was a placeholder migration.
    
    Conflicts:
        keystone/tests/unit/test_sql_upgrade.py
    
    Co-Authored-By: "Matthew Thode" <email address hidden>
    Change-Id: Ie0dc3d2449bace57d3e9323b281a2abd2ad0c983
    closes-bug: #1562934
    (cherry picked from commit 276e57e2083dcad8cbabf9aa9b3bd06c6079c415)

commit cf1fd9dad7d89d50a10ab204aa487663ea258988
Author: OpenStack Proposal Bot <email address hidden>
Date:   Wed Mar 30 06:16:27 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: Iff9556deb5ebb465c7124c120e7806774c517472

commit c4b08ed2522ee771331d53f153bda5098c9fb9f4
Author: OpenStack Proposal Bot <email address hidden>
Date:   Tue Mar 29 06:52:52 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: I1e81320c932549e38bade5ef8d885ef426990f40

commit dd38543bdc2a11b38162fda616fd7933f1539397
Author: Colleen Murphy <email address hidden>
Date:   Tue Mar 22 16:10:06 2016 -0700

    Fix keystone-manage config file path
    
    Without this patch, the keystone-manage command looks for a default
    keystone.conf relative to the installed executable. In a developer's
    case this is likely to be relative to <venv name>/bin/keystone-manage.
    If installed via distro packages this will be something like
    /usr/bin/keystone-manage. The keystone developer documentation
    instructs the developer to copy the sample config file into the etc/
    directory of the keystone source directory[1], which is not necessarily
    related to where the keystone-manage executable is installed. This
    patch causes the keystone-manage command to search for
    etc/keystone.conf relative to the python source file,
    keystone/cmd/manage.py, which will always be in the same place relative
    to the keystone repo's etc/ directory. If installed via distro packages
    this will cause keystone-manage to search for the config in something
    like /usr/lib/python2.7/dist-packages, but since it falls back to
    searching the standard oslo.cfg directories, the behavior won't change.
    
    [1] http://docs.openstack.org/developer/keystone/developing.html#configuring-keystone
    
    Closes-bug: #1561099
    
    Change-Id: Icf9caac030e62deb17ce5df3a82737b408591ac0
    (cherry picked from commit 139f892fecf4ce645e3a7a6a7d1087a94f402f89)

commit 685116d1a2799399819ed780679403e7576e67b5
Author: Brant Knudson <email address hidden>
Date:   Thu Mar 10 08:35:13 2016 -0600

    Correct test to support changing N release name
    
    oslo.log is going to change to use Newton rather than N so this test
    should not make an assumption about the way that
    versionutils.deprecated is calling report_deprecated_feature.
    
    Change-Id: I06aa6d085232376811f73597b2d84b5174bc7a8d
    Closes-Bug: 1561121
    (cherry picked from commit 8556437ee02de028ec5de3b867abaab82533cb91)

commit aa53ad975fdc1a70091b87400c85ff4f1d658d2c
Author: OpenStack Proposal Bot <email address hidden>
Date:   Fri Mar 25 06:49:01 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: I0b0de22a9ddca3cc4b6a4bf5f8478f884c4c51c3

commit ae068b118dca915d237d0dde32e951e0ab48a529
Author: OpenStack Proposal Bot <email address hidden>
Date:   Thu Mar 24 06:48:00 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: Id9219af8be8360d1bb0c9debf376ab2f913a3e5d

commit 8177acdeffcb15a449c5a17e0b1d8f13003ca168
Author: OpenStack Proposal Bot <email address hidden>
Date:   Wed Mar 23 06:39:31 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: Ie6d41a68a92e022f51d332569ca63db9676bd341

commit e4c8600609b986d573b6fd643458c3d925ea6436
Author: OpenStack Proposal Bot <email address hidden>
Date:   Tue Mar 22 06:43:45 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: I46289a230712f85e9c90a39eec6a1aa674045f36

commit 02817c5e7fb6fa76cf6fb691db25f02cd97e928d
Author: OpenStack Proposal Bot <email address hidden>
Date:   Sun Mar 20 06:43:03 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: Ie0249eaf672877fab2b3da72dced9ba9f3c95c9f

commit ff01c0e2be4be19a7be1c9e523c0b2b8e0fea7cd
Author: Boris Bobrov <email address hidden>
Date:   Fri Mar 18 12:49:42 2016 +0300

    Add release note for list_limit support
    
    Change-Id: I8a91f681b4d1c1c018bf5d6faf75d2d841ac0383
    Related-Bug: 1501698

commit f7197c7bde2fba6d1b1254ed5916d1d2a8349618
Author: OpenStack Proposal Bot <email address hidden>
Date:   Fri Mar 18 06:34:21 2016 +0000

    Imported Translations from Zanata
    
    For more information about this automatic import see:
    https://wiki.openstack.org/wiki/Translations/Infrastructure
    
    Change-Id: If3792fbea35a79fb7f7d9fee29af924bed3fc604

commit 9692d40a78651f59db679def493f9712c96e0596
Author: Doug Hellmann <email address hidden>
Date:   Wed Mar 16 16:40:37 2016 -0400

    Update .gitreview for stable/mitaka
    
    Change-Id: Ie89a8030fe133d12603877778dd4b27e76e9a886