Change the default LDAP mapping for description.

Change-Id: I361ec7fde2dde8b9a2091446d4d9f3b95d98f306
Correct SQL migration 017 column name

The user_project_membership still uses tenant_id and not project_id
as a column name, the migration code uses project_id for both tables.

Fixed bug 1130424

Change-Id: Id7c9f78235ad87103ecf469bea312e6291c0a327
Update oslo-config version.

Update the version of oslo-config in pip-requires.  This update includes
a fix for a bug that breaks oslo.config imports.

Change-Id: I2e31d3980c495b1fd16db5488c7d3c982ce069ac
Removed redundant assertion

Change-Id: Iba9f0a5bd713b21487471eb64ce931910b1ca912
domain-scoping

Implement domain-scoping functionality for v3 auth API

Change-Id: Id5e935735a43fefee10a36d9d691578871ba7fcb
Merge "Removed redundant assertion"
Merge "Update oslo-config version."
Merge "domain-scoping"
Tests for domain-scoped tokens

- Fixes bug 1131292: catalog returned with unscoped tokens
- Fixes bug 1131294: X-Subject-Token not returned on token validation

Change-Id: I1808613f276354e2a37cf8c154b55509a2888d89
Fix id_to_dn for creating objects

Only do the lookup if the scope is not ONELEVEL
For ONELEVEL, there is no point in paying the price of the lookup.

If the object is not found for scoped queries, return the top level
DN so the object can be created.

Bug 1131265

Change-Id: I1ca41bf87c3bdea30fbdf607b19192f37dd0bfd6
Merge "Fix id_to_dn for creating objects"
Merge "Tests for domain-scoped tokens"
Merge "Change the default LDAP mapping for description."
Ensure keystone unittests do not leave CONF.policyfile in bad state

A few of the tests overwrite the name of the policy file (so they can
use a temp file instead).  However, if it is left that way, subsequent
tests that rely on it may fail.

A separate patch will look at doing a more comprehensive reset in the
setup of test_v3 - ensuring we always start from a completely clean
slate for all confirguration parameters.

Fixes Bug #1131819

Change-Id: Ibe5ee12f44310de00b12ddd405c83f59b2d840b7
Setup logging in keystone-manage command.

Change-Id: I7739fa0e2715b00f4a8c1bbdecac00768b5c36d6
Remove obsolete *page[_marker] methods from LDAP backend.

Change-Id: I87a75c9f1cd3f6cb3f233df6e54125f35ae4631c
Merge "Correct SQL migration 017 column name"
domain_id_attributes in config.py have wrong default value

Also, as requested I put in this bug fix the related updates
to keystone.conf.sample

Fixes Bug1131443
Fixes Bug1131439

Change-Id: I3e973c8f8ad2783153a2ccb3d743b65eec47e749
Move handle_conflicts decorator into sql

Change-Id: I7ed923592e94f96be5226745224b981c3a3ac161
Merge "Ensure keystone unittests do not leave CONF.policyfile in bad state"