Merge ~corey.bryant/ubuntu/+source/barbican/+git/liberty-1:master into ~ubuntu-server-dev/ubuntu/+source/barbican:master
Proposed by
Corey Bryant
Status: | Merged |
---|---|
Merged at revision: | 53f37453aafc2edc0375b2f66b22327389c8fad7 |
Proposed branch: | ~corey.bryant/ubuntu/+source/barbican/+git/liberty-1:master |
Merge into: | ~ubuntu-server-dev/ubuntu/+source/barbican:master |
Diff against target: |
24288 lines (+10319/-4724) 147 files modified
AUTHORS (+90/-0) ChangeLog (+1256/-0) PKG-INFO (+18/-0) barbican.egg-info/PKG-INFO (+18/-0) barbican.egg-info/SOURCES.txt (+336/-0) barbican.egg-info/dependency_links.txt (+1/-0) barbican.egg-info/entry_points.txt (+21/-0) barbican.egg-info/not-zip-safe (+1/-0) barbican.egg-info/pbr.json (+1/-0) barbican.egg-info/requires.txt (+30/-0) barbican.egg-info/top_level.txt (+1/-0) barbican/api/__init__.py (+3/-10) barbican/api/app.py (+32/-37) barbican/api/controllers/__init__.py (+10/-10) barbican/api/controllers/acls.py (+161/-348) barbican/api/controllers/consumers.py (+16/-2) barbican/api/controllers/containers.py (+12/-2) barbican/api/controllers/orders.py (+1/-1) barbican/api/controllers/secrets.py (+8/-5) barbican/api/controllers/versions.py (+137/-5) barbican/api/hooks.py (+14/-1) barbican/api/middleware/context.py (+37/-47) barbican/api/middleware/simple.py (+2/-3) barbican/common/config.py (+133/-7) barbican/common/hrefs.py (+0/-37) barbican/common/utils.py (+29/-12) barbican/common/validators.py (+16/-22) barbican/context.py (+19/-61) barbican/locale/barbican-log-error.pot (+18/-13) barbican/locale/barbican-log-info.pot (+60/-8) barbican/locale/barbican.pot (+233/-226) barbican/locale/zh_CN/LC_MESSAGES/barbican-log-error.po (+60/-93) barbican/locale/zh_CN/LC_MESSAGES/barbican-log-info.po (+18/-170) barbican/locale/zh_CN/LC_MESSAGES/barbican-log-warning.po (+0/-11) barbican/model/migration/alembic_migrations/versions/161f8aceb687_fill_project_id_to_secrets_where_missing.py (+47/-0) barbican/model/migration/alembic_migrations/versions/1bc885808c76_add_project_id_to_secrets.py (+29/-0) barbican/model/migration/alembic_migrations/versions/1bece815014f_remove_projectsecret_table.py (+50/-0) barbican/model/migration/alembic_migrations/versions/30dba269cc64_update_order_retry_tasks_table.py (+2/-1) barbican/model/migration/alembic_migrations/versions/6a4457517a3_rename_acl_creator_only_to_project_.py (+54/-0) barbican/model/migration/commands.py (+2/-7) barbican/model/models.py (+20/-58) barbican/model/repositories.py (+29/-71) barbican/plugin/crypto/manager.py (+19/-12) barbican/plugin/crypto/p11_crypto.py (+53/-567) barbican/plugin/crypto/pkcs11.py (+664/-0) barbican/plugin/crypto/simple_crypto.py (+3/-1) barbican/plugin/dogtag.py (+86/-52) barbican/plugin/interface/certificate_manager.py (+32/-23) barbican/plugin/interface/secret_store.py (+27/-20) barbican/plugin/kmip_secret_store.py (+232/-83) barbican/plugin/resources.py (+1/-8) barbican/plugin/snakeoil_ca.py (+27/-13) barbican/plugin/store_crypto.py (+5/-11) barbican/plugin/symantec.py (+3/-1) barbican/plugin/util/utils.py (+54/-0) barbican/queue/__init__.py (+4/-61) barbican/queue/keystone_listener.py (+12/-10) barbican/queue/retry_scheduler.py (+4/-18) barbican/queue/server.py (+3/-3) barbican/tasks/resources.py (+1/-1) barbican/tests/api/controllers/test_acls.py (+441/-1109) barbican/tests/api/controllers/test_orders.py (+175/-1) barbican/tests/api/controllers/test_secrets.py (+35/-1) barbican/tests/api/controllers/test_versions.py (+23/-6) barbican/tests/api/middleware/test_context.py (+35/-29) barbican/tests/api/test_init.py (+2/-1) barbican/tests/api/test_resources.py (+2/-11) barbican/tests/api/test_resources_policy.py (+33/-35) barbican/tests/common/test_validators.py (+51/-6) barbican/tests/database_utils.py (+1/-1) barbican/tests/model/repositories/test_repositories.py (+37/-4) barbican/tests/model/repositories/test_repositories_acls.py (+22/-23) barbican/tests/model/repositories/test_repositories_order_retry_tasks.py (+2/-3) barbican/tests/model/repositories/test_repositories_orders.py (+2/-3) barbican/tests/model/repositories/test_repositories_secrets.py (+18/-27) barbican/tests/model/test_models.py (+16/-16) barbican/tests/plugin/crypto/test_p11_crypto.py (+115/-44) barbican/tests/plugin/interface/test_secret_store.py (+11/-1) barbican/tests/plugin/test_kmip.py (+206/-35) barbican/tests/plugin/test_resource.py (+0/-4) barbican/tests/plugin/test_snakeoil_ca.py (+40/-9) barbican/tests/plugin/test_store_crypto.py (+7/-29) barbican/tests/plugin/util/test_utils.py (+70/-0) barbican/tests/queue/test_keystone_listener.py (+9/-9) barbican/tests/queue/test_server.py (+23/-8) barbican/tests/tasks/test_certificate_resources.py (+3/-11) barbican/tests/tasks/test_keystone_consumer.py (+0/-24) barbican/tests/tasks/test_resources.py (+11/-9) barbican/tests/utils.py (+6/-72) bin/barbican-db-manage.py (+7/-7) bin/barbican-keystone-listener.py (+5/-5) bin/barbican-worker-retry-scheduler.py (+3/-3) bin/barbican-worker.py (+3/-4) bin/keystone_data.sh (+123/-12) bin/pkcs11-key-generation (+120/-0) contrib/devstack/extras.d/70-barbican.sh (+6/-1) contrib/devstack/lib/barbican (+249/-5) debian/changelog (+9/-0) debian/control (+41/-37) debian/watch (+2/-2) dev/null (+0/-744) doc/source/api/index.rst (+6/-1) doc/source/api/quickstart/acls.rst (+352/-0) doc/source/api/quickstart/certificates.rst (+329/-0) doc/source/api/quickstart/containers.rst (+6/-0) doc/source/api/quickstart/dogtag_setup.rst (+210/-0) doc/source/api/quickstart/pkcs11keygeneration.rst (+89/-0) doc/source/api/reference/acls.rst (+613/-0) doc/source/api/reference/certificates.rst (+147/-0) doc/source/conf.py (+1/-1) doc/source/contribute/architecture.rst (+78/-0) doc/source/contribute/database_migrations.rst (+1/-1) doc/source/contribute/dataflow.rst (+79/-0) doc/source/contribute/structure.rst (+36/-0) doc/source/index.rst (+3/-0) doc/source/setup/certificate.rst (+19/-0) doc/source/setup/dev.rst (+5/-6) doc/source/setup/index.rst (+1/-0) doc/source/setup/keystone.rst (+1/-1) doc/source/setup/troubleshooting.rst (+0/-3) docs/src/docbkx/samples/resgenerateToken.json (+0/-1) etc/barbican/barbican-api-paste.ini (+6/-7) etc/barbican/barbican-api.conf (+44/-8) etc/barbican/barbican-functional.conf (+25/-0) etc/barbican/policy.json (+11/-15) functionaltests/api/v1/behaviors/base_behaviors.py (+4/-0) functionaltests/api/v1/behaviors/container_behaviors.py (+42/-15) functionaltests/api/v1/behaviors/order_behaviors.py (+27/-13) functionaltests/api/v1/behaviors/secret_behaviors.py (+61/-23) functionaltests/api/v1/functional/test_certificate_orders.py (+27/-5) functionaltests/api/v1/functional/test_containers_rbac.py (+235/-0) functionaltests/api/v1/functional/test_orders.py (+1/-1) functionaltests/api/v1/functional/test_orders_rbac.py (+197/-0) functionaltests/api/v1/functional/test_rsa.py (+590/-0) functionaltests/api/v1/functional/test_secrets.py (+360/-9) functionaltests/api/v1/functional/test_secrets_rbac.py (+306/-0) functionaltests/api/v1/smoke/test_versions.py (+10/-3) functionaltests/common/auth.py (+6/-1) functionaltests/common/client.py (+80/-16) functionaltests/common/config.py (+25/-2) functionaltests/pre_test_hook.sh (+0/-3) functionaltests/run_tests.sh (+2/-9) openstack-common.conf (+1/-1) requirements.txt (+18/-14) setup.cfg (+37/-52) setup.py (+0/-1) test-requirements.txt (+9/-9) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Server Developers | Pending | ||
Review via email:
|
To post a comment you must log in.
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.