There were two conflicts in the rebase that I resolved by deleting downstream patches that weren't needed: --- 09b04beb1c52077b68cd25a354d11e706350c96f sync parameter values with keystone-dist.conf --- 47ef4045c06e1aaa1cacbd9b1f193705187e5fc1 remove runtime dep on python-pbr after this the rebase went well an this is the dist-git commit that's being generated: commit 5ce8c660475b7b4aa35b6f975b92250c56ac90e1 Author: Vladan Popovic Date: Fri Jul 18 21:22:30 2014 +0200 Rebase 97 changes from openstack/master Changelog: - Rebase 97 changes from openstack/master - Sync with oslo-incubator - render json examples with syntax highlighting - Use oslo.i18n - Make sure unit tests set the correct log levels - Clean up the endpoint filtering configuration docs - Avoid loading a ref from SQL to delete the ref - Add revocation extension to default pipeline - multi-backend support for identity - Update docs to reflect new db_sync behaviour - Migrate default extensions - Add oslo.i18n as dependency - Do not use lazy translation for keystone-manage - Update the configuration docs for the revocation extension - Remove deprecated token_api.list_tokens - Imported Translations from Transifex - Add keystonemiddleware to requirements - Add _BaseFederationExtension class - Correct the region table to be InnoDB and UTF8 - HEAD responses should return same status as GET - Updated from global requirements - Sync with oslo-incubator e9bb0b59 - Add schema check for OS-FEDERATION mapping table - Make OS-FEDERATION core.Driver methods abstract - update example with a status code we actually use - Correct docstring for assertResponseSuccessful - Fix the section name in CONTRIBUTING.rst - Fix OAuth1 to not JSON-encode create access token response - Ending periods in exception messages deleted - Add identity mapping capability - Do not use keystone's config for nova's port - Fix docs and scripts for pki_setup and ssl_setup - LDAP: Added documentation for debug_level option - Updated from global requirements - Fixes the order of assertEqual arguments - remove default=None for config options - Fix test for get_*_by_name invalidation - Do not support toggling key_manglers in cache layer - Move bash8 to run under pep8 tox env - Remove db, db.sqlalchemy from openstack-common.conf - Remove backend_entities from backend_ldap.conf - Consolidate provider calls to token_api.create_token - Adds hacking check for debug logging translations - Updates Python3 requirements to match Python2 - Adds oslo.db support for Python 3 tests - Do not leak SQL queries in HTTP 409 (conflict) - Imported Translations from Transifex - Do not log 14+ INFO lines on a broken pipe error (eventlet) - Regenerate sample config file - deprecate LDAP config options for 'tenants' - the user_tenant_membership table was replaced by "assignment" - Corrects minor spelling mistakes - Ignoring order of user list in TenantTestCase - Make gen_pki.sh & debug_helper.sh bash8 compliant - TestAuthInfo class in test_v3_auth made more efficient. - Update docs to reference #openstack-keystone - Don't set sqlite_db default - Migrate ID generation for users/groups from controller to manager - oslo.db implementation - Test `common.sql` initialization - Kerberos as method name - test REMOTE_USER does not authenticate - Document pkiz as provider in config - Only emit disable notifications for project/domain on disable - Fix the typo and reformat the comments for the added option - Updated from global requirements - fix flake8 issues - Update sample keystone.conf file - Fix 500 error if request body is not JSON object - Default to PKIZ tokens - Fix a few typos in the shibboleth doc - pkiz String conversion - Fixes catalog URL formatting to never return None - Updates keystone.catalog.core.format_url tests - Ignore broken endpoints in get_catalog - Allow for multiple PKI Style Providers - Add instructions for removing pyc files to docs - Password trunction makes password insecure - enable multiple keystone-all worker processes - Add cloud auditing notification documentation - Fixes typo error in Keystone - Add missing docstrings and 1 unittest for LDAP utf-8 fixes - Properly invalidate cache for get_*_by_name methods - Make sure domains are enabled by default - Convert explicit session get/begin to transaction context - remove unnecessary word in docs: 'an' - Add v3 curl examples - Use code-block for curl examples - Sync service module from oslo-incubator - remove unneeded definitions of Python Source Code Encoding - gitignore etc/keystone/ - Enforce ``saml2`` protocol in Apache config - install gettext on OS X for msgfmt - Use translation hints - update release support warning for domain-specific drivers - Fix type error message in format_url - sync parameter values with keystone-dist.conf - remove runtime dep on python-pbr 0001-Fix-type-error-message-in-format_url.patch | 2 +- ...ase-support-warning-for-domain-specific-d.patch | 2 +- 0003-Use-translation-hints.patch | 2 +- 0004-install-gettext-on-OS-X-for-msgfmt.patch | 2 +- 0005-Enforce-saml2-protocol-in-Apache-config.patch | 2 +- 0006-gitignore-etc-keystone.patch | 2 +- ...eded-definitions-of-Python-Source-Code-En.patch | 2 +- 0008-Sync-service-module-from-oslo-incubator.patch | 2 +- 0009-Use-code-block-for-curl-examples.patch | 2 +- 0010-Add-v3-curl-examples.patch | 2 +- 0011-remove-unnecessary-word-in-docs-an.patch | 2 +- ...licit-session-get-begin-to-transaction-co.patch | 2 +- ...-Make-sure-domains-are-enabled-by-default.patch | 2 +- ...nvalidate-cache-for-get_-_by_name-methods.patch | 2 +- ...-docstrings-and-1-unittest-for-LDAP-utf-8.patch | 2 +- 0016-Fixes-typo-error-in-Keystone.patch | 2 +- ...-Block-delegation-escalation-of-privilege.patch | 2 +- ...cloud-auditing-notification-documentation.patch | 2 +- ...le-multiple-keystone-all-worker-processes.patch | 2 +- ...assword-trunction-makes-password-insecure.patch | 2 +- ...structions-for-removing-pyc-files-to-docs.patch | 2 +- 0022-Allow-for-multiple-PKI-Style-Providers.patch | 2 +- 0023-Ignore-broken-endpoints-in-get_catalog.patch | 2 +- ...es-keystone.catalog.core.format_url-tests.patch | 2 +- ...talog-URL-formatting-to-never-return-None.patch | 2 +- 0026-pkiz-String-conversion.patch | 2 +- 0027-Fix-a-few-typos-in-the-shibboleth-doc.patch | 2 +- 0028-Default-to-PKIZ-tokens.patch | 2 +- ...-error-if-request-body-is-not-JSON-object.patch | 2 +- 0030-Update-sample-keystone.conf-file.patch | 2 +- 0031-fix-flake8-issues.patch | 2 +- 0032-Updated-from-global-requirements.patch | 2 +- ...o-and-reformat-the-comments-for-the-added.patch | 2 +- ...isable-notifications-for-project-domain-o.patch | 2 +- 0035-Document-pkiz-as-provider-in-config.patch | 2 +- 0036-test-REMOTE_USER-does-not-authenticate.patch | 2 +- 0037-Kerberos-as-method-name.patch | 2 +- 0038-Test-common.sql-initialization.patch | 2 +- 0039-oslo.db-implementation.patch | 2 +- ...generation-for-users-groups-from-controll.patch | 2 +- 0041-Don-t-set-sqlite_db-default.patch | 2 +- ...date-docs-to-reference-openstack-keystone.patch | 2 +- ...o-class-in-test_v3_auth-made-more-efficie.patch | 2 +- ...en_pki.sh-debug_helper.sh-bash8-compliant.patch | 2 +- ...ring-order-of-user-list-in-TenantTestCase.patch | 2 +- 0046-Corrects-minor-spelling-mistakes.patch | 2 +- ...nant_membership-table-was-replaced-by-ass.patch | 2 +- ...deprecate-LDAP-config-options-for-tenants.patch | 2 +- 0049-Regenerate-sample-config-file.patch | 2 +- ...14-INFO-lines-on-a-broken-pipe-error-even.patch | 2 +- 0051-Imported-Translations-from-Transifex.patch | 2 +- ...not-leak-SQL-queries-in-HTTP-409-conflict.patch | 2 +- 0053-Adds-oslo.db-support-for-Python-3-tests.patch | 2 +- ...tes-Python3-requirements-to-match-Python2.patch | 2 +- ...king-check-for-debug-logging-translations.patch | 2 +- ...-provider-calls-to-token_api.create_token.patch | 2 +- ...e-backend_entities-from-backend_ldap.conf.patch | 2 +- ...-db.sqlalchemy-from-openstack-common.conf.patch | 2 +- 0059-Move-bash8-to-run-under-pep8-tox-env.patch | 2 +- ...port-toggling-key_manglers-in-cache-layer.patch | 2 +- 0061-Fix-test-for-get_-_by_name-invalidation.patch | 2 +- 0062-remove-default-None-for-config-options.patch | 2 +- ...-Fixes-the-order-of-assertEqual-arguments.patch | 2 +- 0064-Updated-from-global-requirements.patch | 2 +- ...dded-documentation-for-debug_level-option.patch | 2 +- ...s-and-scripts-for-pki_setup-and-ssl_setup.patch | 2 +- ...not-use-keystone-s-config-for-nova-s-port.patch | 2 +- 0068-Add-identity-mapping-capability.patch | 2 +- ...e-that-in-v2-auth-tenant_id-matches-trust.patch | 2 +- ...ing-periods-in-exception-messages-deleted.patch | 2 +- ...to-not-JSON-encode-create-access-token-re.patch | 2 +- ...-Fix-the-section-name-in-CONTRIBUTING.rst.patch | 2 +- ...ct-docstring-for-assertResponseSuccessful.patch | 2 +- ...xample-with-a-status-code-we-actually-use.patch | 2 +- ...S-FEDERATION-core.Driver-methods-abstract.patch | 2 +- ...ema-check-for-OS-FEDERATION-mapping-table.patch | 2 +- 0077-Sync-with-oslo-incubator-e9bb0b59.patch | 2 +- 0078-Updated-from-global-requirements.patch | 2 +- ...esponses-should-return-same-status-as-GET.patch | 2 +- ...ct-the-region-table-to-be-InnoDB-and-UTF8.patch | 2 +- 0081-Add-_BaseFederationExtension-class.patch | 2 +- 0082-Add-keystonemiddleware-to-requirements.patch | 2 +- 0083-Imported-Translations-from-Transifex.patch | 2 +- 0084-Remove-deprecated-token_api.list_tokens.patch | 2 +- ...configuration-docs-for-the-revocation-ext.patch | 2 +- ...-use-lazy-translation-for-keystone-manage.patch | 2 +- 0087-Add-oslo.i18n-as-dependency.patch | 2 +- 0088-Migrate-default-extensions.patch | 2 +- ...ate-docs-to-reflect-new-db_sync-behaviour.patch | 2 +- 0090-multi-backend-support-for-identity.patch | 2 +- ...-revocation-extension-to-default-pipeline.patch | 2 +- ...-loading-a-ref-from-SQL-to-delete-the-ref.patch | 2 +- ...the-endpoint-filtering-configuration-docs.patch | 2 +- ...ure-unit-tests-set-the-correct-log-levels.patch | 2 +- 0095-Use-oslo.i18n.patch | 2 +- ...er-json-examples-with-syntax-highlighting.patch | 2 +- 0097-Sync-with-oslo-incubator.patch | 2 +- openstack-keystone.spec | 102 ++++++++++++++++++++- 98 files changed, 198 insertions(+), 98 deletions(-)