Merge ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master into ~livepatch-charmers/charm-canonical-livepatch:master
Proposed by
Barry Price
Status: | Merged |
---|---|
Approved by: | Barry Price |
Approved revision: | d756423732711b3d34d5ac4eb4717652d2466869 |
Merged at revision: | d70cd8dadb3d78b4bc01559dd8cc1f0f788c2ec0 |
Proposed branch: | ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master |
Merge into: | ~livepatch-charmers/charm-canonical-livepatch:master |
Diff against target: |
155 lines (+44/-21) 4 files modified
Makefile (+2/-2) dev/null (+0/-0) files/check_canonical-livepatch.py (+2/-2) reactive/canonical_livepatch.py (+40/-17) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stuart Bishop (community) | Approve | ||
Review via email: mp+355912@code.launchpad.net |
Commit message
Write our actual live status for the nagios check, instead of an empty file (which the latest check script would see as an error)
To post a comment you must log in.
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.