Merge lp://staging/~ajkavanagh/charm-helpers/fix-lint-and-errors into lp://staging/charm-helpers
Proposed by
Alex Kavanagh
Status: | Merged |
---|---|
Merged at revision: | 764 |
Proposed branch: | lp://staging/~ajkavanagh/charm-helpers/fix-lint-and-errors |
Merge into: | lp://staging/charm-helpers |
Diff against target: |
71 lines (+13/-9) 3 files modified
charmhelpers/contrib/storage/linux/ceph.py (+1/-1) charmhelpers/fetch/snap.py (+11/-5) tests/contrib/openstack/test_openstack_utils.py (+1/-3) |
To merge this branch: | bzr merge lp://staging/~ajkavanagh/charm-helpers/fix-lint-and-errors |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Page | Approve | ||
Review via email: mp+327788@code.staging.launchpad.net |
Description of the change
Fix lint and other errors introduced in last few merges
It seems likely that the last couple of merges have been performed
without running a 'make test' before pushing it back to tip.
Essentially, the tip of charm-helpers won't pass make-test, and the
ceph changes unbreaks a breaking change introduced to charm-helpers
recently. Please can we ensure that we run 'make test', and fix
ALL the errors, before merging back into devel's tip.
To post a comment you must log in.