Merge "Remove paste_deploy from test_overrides.conf"
Merge "Fix assertEqual arguments order(backend_ldap, cache, v3_protection)"
Merge "Remove "test-only" pam config options"
Update Oslo wiki link in README

Use lastest Oslo wiki link.

Change-Id: I2a92733c506da90a27cb882bc9e9bd8498510084
Merge "Replace assertEqual(None, *) with assertIsNone in tests"
Merge "Remove unused variable"
Merge "Fix assertEqual arguments order(_ldap_tls_livetest, backend_kvs, etc)"
Merge "deprecate XML support in favor of JSON"
Merge "Remove the un-used and non-maintained PAM identity backend"
Update curl api example to specify tenant

In the keystone api_curl_examples document, the curl example for
"POST /tokens" did not specify a tenant. This example utilized
the default tenant, which is not commonly used. Changed the
example to include "tenantName" as part of the example to prevent
future confusion.

DocImpact

Closes-Bug: #1269739

Change-Id: Iaad8c7c5a32bc6cff38c938dd36365cddd6741cb
Merge "SQLAlchemy Change to support more strict dialect checking"
Limited use trusts

Trusts now have a "remaining_uses" field that tracks how many times
a trust can still issue a token. It is decremented by 1 each time a
trust related authentication occurs (call to /auth/tokens), until it
reaches 0 and no token can be issued through this trust anymore. If
set to null (default value), trusts can be used indefinitely to
authenticate.

Closes-Bug: #1250617
Implements: bp trusts-chained-delegation
DocImpact
Co-Authored-By: Florent Flament <florent.flament-ext@cloudwatt.com>

Change-Id: I2c80b6d548a6715da0366c6f64ee58fbce514adb
Merge "Add tests for endpoint enabled."
Merge "Properly configure OS-EP-FILTER test backend"
Merge "Update oslo-incubator log.py to a01f79c"
Merge "Limited use trusts"
drop key distribution from icehouse

key distribution is being continued in feature branch here:

  https://github.com/openstack/keystone/tree/feature/key-dist

Change-Id: I47504bec73dd7e1a6419a5509093a9d494d90108
Merge "Remove common.sql.migration"
Removes use of timeutils.set_time_override

The set_time_override function in timeutils was written as a
helper function to mock utcnow for unittests before 'mock' was
generally used. Now that we have mock and fixture, we no longer
need to use it.

Change-Id: I1af631f36c813740dbf22da030c2c1f50265d156
Partial-Bug: #1266962
Remove vim headers

Second round to remove all vim headers. We don't need to have the
vim headers in each source files.

More discussions:
http://lists.openstack.org/pipermail/openstack-dev/2013-October/017353.html

Change-Id: I43703e2289212389c7841f44691ae7849ed1f505
Closes-Bug: #1229324