Merge lp://qastaging/~mew/charm-helpers/lp1202804 into lp://qastaging/charm-helpers
Proposed by
Matthew Wedgwood
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 69 | ||||
| Proposed branch: | lp://qastaging/~mew/charm-helpers/lp1202804 | ||||
| Merge into: | lp://qastaging/charm-helpers | ||||
| Diff against target: |
542 lines (+126/-125) 11 files modified
charmhelpers/contrib/ansible/__init__.py (+2/-2) charmhelpers/contrib/hahelpers/ceph.py (+4/-1) charmhelpers/contrib/openstack/templating.py (+1/-1) charmhelpers/contrib/openstack/utils.py (+3/-0) charmhelpers/contrib/saltstack/__init__.py (+1/-1) charmhelpers/core/host.py (+0/-44) charmhelpers/fetch/__init__.py (+44/-3) tests/contrib/ansible/test_ansible.py (+3/-5) tests/contrib/saltstack/test_saltstates.py (+8/-9) tests/core/test_host.py (+10/-56) tests/fetch/test_fetch.py (+50/-3) |
||||
| To merge this branch: | bzr merge lp://qastaging/~mew/charm-helpers/lp1202804 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jacek Nykis (community) | Approve | ||
| Charm Helper Maintainers | Pending | ||
|
Review via email:
|
|||
Description of the change
Per lp:1202804, I've moved the apt-specific helpers out of core.host and into fetch as core.host is intended to be platform-agnostic.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks fine