Prometheus2 charm

Merge ~cjohnston/charm-prometheus2:doc-tweaks into charm-prometheus2:master

  1. Git
  2. lp:~cjohnston/charm-prometheus2
  3. doc-tweaks
  4. Merge into master
Proposed by Chris Johnston
Status: Merged
Approved by: Eric Chen
Approved revision: 660df4a7464c2de808cd706aaaf80a8504d607ec
Merged at revision: 4c824e138bdc0f7b03f5ff4e562e58c8e654db9b
Proposed branch: ~cjohnston/charm-prometheus2:doc-tweaks
Merge into: charm-prometheus2:master
Diff against target: 21 lines (+2/-1)
1 file modified
src/config.yaml (+2/-1)
Reviewer Review Type Date Requested Status
Eric Chen Approve
🤖 prod-jenkaas-bootstack continuous-integration Approve
BootStack Reviewers Pending
Review via email: mp+443139@code.staging.launchpad.net

Commit message

Clarify config description of rules-repo and rules-update-ssh-key.

Fixes: LP: #2018932, #2018933

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
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

PASSED: Continuous integration, rev:660df4a7464c2de808cd706aaaf80a8504d607ec
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/12/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/961/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/306/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/12//rebuild

review: Approve (continuous-integration)
Revision history for this message
Eric Chen (eric-chen) wrote :

LGTM

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

Change successfully merged at revision 4c824e138bdc0f7b03f5ff4e562e58c8e654db9b

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

to all changes: