Merge lp://qastaging/~1chb1n/charms/trusty/ceph-osd/next-ch-sync-mitaka into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-osd/next
Proposed by
Ryan Beisner
| Status: | Merged |
|---|---|
| Merged at revision: | 59 |
| Proposed branch: | lp://qastaging/~1chb1n/charms/trusty/ceph-osd/next-ch-sync-mitaka |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-osd/next |
| Diff against target: |
2384 lines (+1314/-241) 18 files modified
hooks/charmhelpers/cli/__init__.py (+3/-3) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+52/-14) hooks/charmhelpers/contrib/network/ip.py (+26/-22) hooks/charmhelpers/core/hookenv.py (+84/-4) hooks/charmhelpers/core/host.py (+153/-50) hooks/charmhelpers/core/hugepage.py (+10/-1) hooks/charmhelpers/core/kernel.py (+68/-0) hooks/charmhelpers/core/services/helpers.py (+14/-5) hooks/charmhelpers/core/strutils.py (+30/-0) hooks/charmhelpers/core/templating.py (+21/-8) hooks/charmhelpers/fetch/__init__.py (+10/-2) hooks/charmhelpers/fetch/archiveurl.py (+1/-1) hooks/charmhelpers/fetch/bzrurl.py (+22/-32) hooks/charmhelpers/fetch/giturl.py (+20/-23) tests/charmhelpers/contrib/amulet/deployment.py (+4/-2) tests/charmhelpers/contrib/amulet/utils.py (+284/-62) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+131/-12) tests/charmhelpers/contrib/openstack/amulet/utils.py (+381/-0) |
| To merge this branch: | bzr merge lp://qastaging/~1chb1n/charms/trusty/ceph-osd/next-ch-sync-mitaka |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Corey Bryant (community) | Approve | ||
|
Review via email:
|
|||
Commit message
sync charm helpers for mitaka cloud archive recognition
Description of the change
sync charm helpers for mitaka cloud archive recognition
To post a comment you must log in.
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Revision history for this message
| Corey Bryant (corey.bryant) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
charm_unit_test #16782 ceph-osd-next for 1chb1n mp283704
UNIT OK: passed
Build: http://