Merge lp://staging/~barryprice/charm-haproxy/charm-helpers-sync into lp://staging/charm-haproxy
Proposed by
Barry Price
| Status: | Merged |
|---|---|
| Approved by: | Nick Moffitt |
| Approved revision: | 126 |
| Merged at revision: | 125 |
| Proposed branch: | lp://staging/~barryprice/charm-haproxy/charm-helpers-sync |
| Merge into: | lp://staging/charm-haproxy |
| Prerequisite: | lp://staging/~barryprice/charm-haproxy/linting-fixes |
| Diff against target: |
2695 lines (+1712/-168) 24 files modified
hooks/charmhelpers/__init__.py (+65/-4) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+32/-9) hooks/charmhelpers/core/hookenv.py (+450/-28) hooks/charmhelpers/core/host.py (+168/-11) hooks/charmhelpers/core/host_factory/centos.py (+16/-0) hooks/charmhelpers/core/host_factory/ubuntu.py (+57/-0) hooks/charmhelpers/core/kernel.py (+2/-2) hooks/charmhelpers/core/services/base.py (+18/-7) hooks/charmhelpers/core/strutils.py (+64/-5) hooks/charmhelpers/core/sysctl.py (+21/-10) hooks/charmhelpers/core/templating.py (+18/-9) hooks/charmhelpers/core/unitdata.py (+8/-1) hooks/charmhelpers/fetch/__init__.py (+19/-9) hooks/charmhelpers/fetch/archiveurl.py (+1/-1) hooks/charmhelpers/fetch/bzrurl.py (+2/-2) hooks/charmhelpers/fetch/centos.py (+1/-1) hooks/charmhelpers/fetch/giturl.py (+2/-2) hooks/charmhelpers/fetch/python/__init__.py (+13/-0) hooks/charmhelpers/fetch/python/debug.py (+54/-0) hooks/charmhelpers/fetch/python/packages.py (+154/-0) hooks/charmhelpers/fetch/python/rpdb.py (+56/-0) hooks/charmhelpers/fetch/python/version.py (+32/-0) hooks/charmhelpers/fetch/snap.py (+33/-5) hooks/charmhelpers/fetch/ubuntu.py (+426/-62) |
| To merge this branch: | bzr merge lp://staging/~barryprice/charm-haproxy/charm-helpers-sync |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| haproxy-team | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2019-03-21.
Commit message
charm-helpers sync
To post a comment you must log in.
Revision history for this message
| 🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote | # |
Revision history for this message
| 🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote | # |
Revision history for this message
| 🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.