Merge ~jacekn/charm-prometheus-alertmanager:master into ~prometheus-charmers/charm-prometheus-alertmanager:master

Proposed by Jacek Nykis
Status: Merged
Approved by: Jamon Camisso
Approved revision: 12c8bc5182e95724d2aa089af5b44cd554466c96
Merged at revision: a8559e3dc1747ba82a65f4bbc5cd781edcf1edcf
Proposed branch: ~jacekn/charm-prometheus-alertmanager:master
Merge into: ~prometheus-charmers/charm-prometheus-alertmanager:master
Diff against target: 14 lines (+3/-0)
1 file modified
reactive/alertmanager.py (+3/-0)
Reviewer Review Type Date Requested Status
Prometheus Charmers Pending
Review via email: mp+347151@code.staging.launchpad.net

Commit message

Ensure short CLI options are removed from unitdata when long ones are set to avoid duplicates

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
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision a8559e3dc1747ba82a65f4bbc5cd781edcf1edcf

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches