Merge lp://qastaging/~james-page/charms/trusty/swift-storage/xenial into lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/next
Proposed by
James Page
Status: | Merged |
---|---|
Merged at revision: | 104 |
Proposed branch: | lp://qastaging/~james-page/charms/trusty/swift-storage/xenial |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/next |
Diff against target: |
663 lines (+177/-86) 12 files modified
charmhelpers/contrib/openstack/amulet/deployment.py (+3/-2) charmhelpers/contrib/openstack/context.py (+11/-7) charmhelpers/contrib/openstack/neutron.py (+18/-6) charmhelpers/contrib/openstack/utils.py (+65/-23) charmhelpers/contrib/python/packages.py (+22/-7) charmhelpers/core/host.py (+41/-26) charmhelpers/fetch/giturl.py (+3/-1) lib/swift_storage_context.py (+0/-3) lib/swift_storage_utils.py (+2/-1) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+3/-2) unit_tests/test_swift_storage_context.py (+0/-4) unit_tests/test_swift_storage_utils.py (+9/-4) |
To merge this branch: | bzr merge lp://qastaging/~james-page/charms/trusty/swift-storage/xenial |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenStack Charmers | Pending | ||
Review via email: mp+284515@code.qastaging.launchpad.net |
This proposal supersedes a proposal from 2016-01-30.
Description of the change
Resync helpers, fixup xenial support.
To post a comment you must log in.
charm_lint_check #18391 swift-storage-next for james-page mp284515
LINT FAIL: lint-test failed
LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.
Full lint test output: http:// paste.ubuntu. com/14731093/ 10.245. 162.77: 8080/job/ charm_lint_ check/18391/
Build: http://