Merge lp://staging/~zulcss/ubuntu/precise/python-keystoneclient/new into lp://staging/~ubuntu-cloud-archive/ubuntu/precise/python-keystoneclient/trunk
Proposed by
Chuck Short
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 26 | ||||||||
Proposed branch: | lp://staging/~zulcss/ubuntu/precise/python-keystoneclient/new | ||||||||
Merge into: | lp://staging/~ubuntu-cloud-archive/ubuntu/precise/python-keystoneclient/trunk | ||||||||
Diff against target: |
11180 lines (+8589/-754) 109 files modified
.gitignore (+2/-0) AUTHORS (+11/-0) PKG-INFO (+93/-64) README.rst (+90/-62) babel.cfg (+1/-0) debian/changelog (+23/-0) debian/control (+3/-3) doc/source/_theme/layout.html (+83/-0) doc/source/_theme/theme.conf (+4/-0) doc/source/conf.py (+22/-11) doc/source/index.rst (+11/-10) doc/source/ref/client.rst (+0/-8) doc/source/ref/endpoints.rst (+0/-11) doc/source/ref/exceptions.rst (+0/-8) doc/source/ref/generic-client.rst (+0/-12) doc/source/ref/index.rst (+0/-16) doc/source/ref/roles.rst (+0/-9) doc/source/ref/services.rst (+0/-11) doc/source/ref/tenants.rst (+0/-11) doc/source/ref/users.rst (+0/-9) doc/source/releases.rst (+28/-101) doc/source/shell.rst (+34/-13) doc/source/static/basic.css (+416/-0) doc/source/static/default.css (+230/-0) doc/source/static/jquery.tweet.js (+154/-0) doc/source/static/nature.css (+245/-0) doc/source/static/tweaks.css (+94/-0) doc/source/using-api.rst (+19/-15) examples/pki/certs/cacert.pem (+18/-0) examples/pki/certs/middleware.pem (+33/-0) examples/pki/certs/signing_cert.pem (+17/-0) examples/pki/certs/ssl_cert.pem (+17/-0) examples/pki/cms/auth_token_revoked.json (+1/-0) examples/pki/cms/auth_token_revoked.pem (+42/-0) examples/pki/cms/auth_token_scoped.json (+1/-0) examples/pki/cms/auth_token_scoped.pem (+41/-0) examples/pki/cms/auth_token_unscoped.json (+1/-0) examples/pki/cms/auth_token_unscoped.pem (+17/-0) examples/pki/cms/revocation_list.json (+1/-0) examples/pki/cms/revocation_list.pem (+12/-0) examples/pki/gen_pki.sh (+222/-0) examples/pki/private/cakey.pem (+16/-0) examples/pki/private/signing_key.pem (+16/-0) examples/pki/private/ssl_key.pem (+16/-0) keystoneclient/access.py (+144/-0) keystoneclient/base.py (+126/-4) keystoneclient/client.py (+72/-41) keystoneclient/common/cms.py (+169/-0) keystoneclient/contrib/bootstrap/shell.py (+28/-0) keystoneclient/exceptions.py (+19/-1) keystoneclient/generic/shell.py (+9/-7) keystoneclient/locale/keystoneclient.pot (+20/-0) keystoneclient/middleware/auth_token.py (+864/-0) keystoneclient/middleware/test.py (+67/-0) keystoneclient/openstack/common/cfg.py (+1653/-0) keystoneclient/openstack/common/iniparser.py (+130/-0) keystoneclient/openstack/common/jsonutils.py (+148/-0) keystoneclient/openstack/common/setup.py (+63/-39) keystoneclient/openstack/common/timeutils.py (+137/-0) keystoneclient/service_catalog.py (+17/-3) keystoneclient/shell.py (+97/-75) keystoneclient/utils.py (+25/-4) keystoneclient/v2_0/client.py (+135/-37) keystoneclient/v2_0/shell.py (+28/-7) keystoneclient/v2_0/tenants.py (+15/-3) keystoneclient/v2_0/tokens.py (+9/-1) keystoneclient/v3/__init__.py (+1/-0) keystoneclient/v3/client.py (+85/-0) keystoneclient/v3/credentials.py (+57/-0) keystoneclient/v3/domains.py (+55/-0) keystoneclient/v3/endpoints.py (+86/-0) keystoneclient/v3/policies.py (+77/-0) keystoneclient/v3/projects.py (+82/-0) keystoneclient/v3/roles.py (+110/-0) keystoneclient/v3/services.py (+60/-0) keystoneclient/v3/users.py (+70/-0) keystoneclient/versioninfo (+1/-1) openstack-common.conf (+1/-1) python_keystoneclient.egg-info/PKG-INFO (+93/-64) python_keystoneclient.egg-info/SOURCES.txt (+66/-9) python_keystoneclient.egg-info/requires.txt (+1/-1) run_tests.sh (+6/-1) setup.cfg (+14/-0) setup.py (+2/-1) tests/client_fixtures.py (+72/-0) tests/test_access.py (+56/-0) tests/test_auth_token_middleware.py (+670/-0) tests/test_client.py (+37/-0) tests/test_http.py (+31/-19) tests/test_https.py (+10/-16) tests/v2_0/test_auth.py (+0/-6) tests/v2_0/test_ec2.py (+1/-1) tests/v2_0/test_endpoints.py (+1/-1) tests/v2_0/test_roles.py (+15/-17) tests/v2_0/test_tenants.py (+55/-17) tests/v2_0/test_tokens.py (+1/-1) tests/v2_0/test_users.py (+1/-1) tests/v3/test_credentials.py (+22/-0) tests/v3/test_domains.py (+20/-0) tests/v3/test_endpoints.py (+78/-0) tests/v3/test_policies.py (+21/-0) tests/v3/test_projects.py (+69/-0) tests/v3/test_roles.py (+252/-0) tests/v3/test_services.py (+21/-0) tests/v3/test_users.py (+23/-0) tests/v3/utils.py (+227/-0) tools/install_venv.py (+25/-0) tools/pip-requires (+1/-1) tools/test-requires (+4/-0) |
||||||||
To merge this branch: | bzr merge lp://staging/~zulcss/ubuntu/precise/python-keystoneclient/new | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Page | Approve | ||
Review via email: mp+137202@code.staging.launchpad.net |
To post a comment you must log in.
LGTM; please upload with -v to ensure change history maintained.