Merge ~barryprice/charm-nrpe/+git/nrpe-charm:master into ~nrpe-charmers/charm-nrpe:master

Proposed by Barry Price
Status: Merged
Approved by: Junien F
Approved revision: 5a68b1d37b457b280b1ca15efb9b4d74731b29ea
Merged at revision: 448db5077d12374b6dd001d79e140b40f58c4b70
Proposed branch: ~barryprice/charm-nrpe/+git/nrpe-charm:master
Merge into: ~nrpe-charmers/charm-nrpe:master
Diff against target: 20 lines (+2/-2)
2 files modified
charm-helpers-hooks.yaml (+1/-1)
charm-helpers-tests.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Junien F Approve
Review via email: mp+337039@code.launchpad.net

Commit message

Freshen charm_helpers_sync.py, make sync, remove yakkety and zesty support (EOL), add artful & bionic support

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Junien F (axino) wrote :

+1

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 448db5077d12374b6dd001d79e140b40f58c4b70

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml
index a697bd9..9617868 100644
--- a/charm-helpers-hooks.yaml
+++ b/charm-helpers-hooks.yaml
@@ -1,4 +1,4 @@
1branch: lp:charm-helpers1branch: https://github.com/juju/charm-helpers
2destination: hooks/charmhelpers2destination: hooks/charmhelpers
3include:3include:
4 - core4 - core
diff --git a/charm-helpers-tests.yaml b/charm-helpers-tests.yaml
index bcd4ea6..64cf703 100644
--- a/charm-helpers-tests.yaml
+++ b/charm-helpers-tests.yaml
@@ -1,4 +1,4 @@
1branch: lp:charm-helpers1branch: https://github.com/juju/charm-helpers
2destination: tests/charmhelpers2destination: tests/charmhelpers
3include:3include:
4 - contrib.amulet4 - contrib.amulet

Subscribers

People subscribed via source and target branches