← Back to team overview

nagios-charmers team mailing list archive

Thread
Date

Re: [Merge] ~szeestraten/charm-nagios:bug/1864968 into charm-nagios:master

To: Sandor Zeestraten <sandor@xxxxxxxxxxxxxxx>
From: Xav Paice <xav.paice@xxxxxxxxxxxxx>
Date: Tue, 17 Mar 2020 03:00:17 -0000
In-reply-to: <158279480581.26646.15449222815532655428.launchpad@ackee.canonical.com>
Reply-to: mp+379943@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Review: Needs Fixing

There's some merge conflict markers in hooks/upgrade-charm which need sorting, and likely a rebase against master to ensure there's no further conflicts.

Other than that, lgtm.
-- 
https://code.launchpad.net/~szeestraten/charm-nagios/+git/nagios-charm/+merge/379943
Your team Nagios Charm developers is subscribed to branch charm-nagios:master.

References

[Merge] ~szeestraten/charm-nagios:bug/1864968 into charm-nagios:master
From: Sandor Zeestraten, 2020-02-27