Merge lp:~stub/charm-helpers/integration into lp:charm-helpers
Status: | Merged |
---|---|
Merged at revision: | 371 |
Proposed branch: | lp:~stub/charm-helpers/integration |
Merge into: | lp:charm-helpers |
Diff against target: |
423 lines (+120/-37) 11 files modified
charmhelpers/contrib/peerstorage/__init__.py (+2/-0) charmhelpers/contrib/unison/__init__.py (+5/-4) charmhelpers/core/hookenv.py (+18/-4) charmhelpers/core/host.py (+1/-1) charmhelpers/core/services/base.py (+2/-2) charmhelpers/fetch/__init__.py (+1/-1) tests/contrib/peerstorage/test_peerstorage.py (+8/-0) tests/contrib/unison/test_unison.py (+7/-5) tests/core/test_hookenv.py (+51/-5) tests/core/test_services.py (+12/-0) tests/core/test_templating.py (+13/-15) |
To merge this branch: | bzr merge lp:~stub/charm-helpers/integration |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email: mp+257748@code.launchpad.net |
Description of the change
This is an integration branch containing the last few months worth of outstanding merge proposals. If you review and land this, all my other outstanding ones will automatically get flagged as merged.
Or if you rather, review and land the smaller focused MPs which will leave this one empty.
https:/
https:/
https:/
https:/
https:/
https:/
https:/
Approve