Merge "Remove obsolete *page[_marker] methods from LDAP backend."
Merge "bug 1134802: fix inconsistent format for expires_at and issued_at"
Merge "Trusts"
Merge "Expand v3 trust test coverage"
Merge "keystone : Use Ec2Signer utility class from keystoneclient"
ports should be ints in config (bug 1137696)

Change-Id: I26c0481f1f8987f310e3c3710be49d541418e3fd
remove unused import

Change-Id: I82f45c1dca4b96c43387640803a006ac2ab61689
cleanup trusts in controllers

Change-Id: I1eff618d1e6cef2eb10ae7e737b0ca0beaca1d4d
Change exception raised to Forbidden on trust_id

Change-Id: I30f89d52ade45335d2f29b8454438d0dd3b20a97
Move auth plugins to 'keystone.auth.plugins' (bug 1136967)

Change-Id: I8c72ee99695b0c039a91f807a13a832ce2c3ff74
unable to load certificate should abort request

If openssl returns with a command line error (3), we assume
the PKI certificate is not properly installed.  Added
'try ... except' blocks to cms_sign_text and cms_sign_token
calls.

Fixes: bug #1103569
Change-Id: Iad98738e990d3ab1ec0d0015840d76cf948ae560
mark 2.0 API as stable

Bug 1135230

Change-Id: Icb0ae39b5ac4514c04220b846ebbe24d059ba6c1
Merge "Move auth plugins to 'keystone.auth.plugins' (bug 1136967)"
Merge "ports should be ints in config (bug 1137696)"
Merge "mark 2.0 API as stable"
fix typo in kvs backend

Change-Id: I74134bae9abff847d317e0074cae1878cf76aae8
Merge "Straighten out NotFound raising in LDAP backend."
Move get_by_name to LdapBase.

Change-Id: Id75a3c56aeb414c4bee9bcb606033f8f360637bc
Remove unused methods from LDAP backed.

Change-Id: I642a5f3471da00c9e91bc3150beebe345d88187a
Merge "fix typo in kvs backend"