Prometheus Alertmanager Charm

Merge ~aluria/charm-prometheus-alertmanager:fix/tox-make-lint into ~prometheus-charmers/charm-prometheus-alertmanager:master

  1. Git
  2. lp:~aluria/charm-prometheus-alertmanager
  3. fix/tox-make-lint
  4. Merge into master
Proposed by Alvaro Uria
Status: Merged
Approved by: Alvaro Uria
Approved revision: f573106beeece008689d866b7ab4027983ea24bb
Merged at revision: 7927aadefcc3f0c803496192d565c4d26cd27b7d
Proposed branch: ~aluria/charm-prometheus-alertmanager:fix/tox-make-lint
Merge into: ~prometheus-charmers/charm-prometheus-alertmanager:master
Diff against target: 215 lines (+113/-27)
6 files modified
.gitignore (+31/-0)
Makefile (+36/-1)
hooks/defaulthook.py (+2/-2)
reactive/alertmanager.py (+9/-9)
tox.ini (+26/-9)
unit_tests/test_reactive_alertmanager.py (+9/-6)
Reviewer Review Type Date Requested Status
Giuseppe Petralia Approve
Canonical IS Reviewers Pending
Review via email: mp+379388@code.staging.launchpad.net

Commit message

Update tox/make to align with LMA charms

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 :

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

Revision history for this message
Tom Haddon (mthaddon) wrote :

Some questions about commented sections. Is this ready for review, or still a work in progress?

Revision history for this message
Tom Haddon (mthaddon) wrote :

And a follow up question about line length.

Revision history for this message
Giuseppe Petralia (peppepetra) wrote :

MP lgtm (only code review, I haven't run make)

Added a comment inline to possibly replace deprecated env vars in "make build". Thank you.

review: Approve
Revision history for this message
Alvaro Uria (aluria) wrote :

Thank you Giuseppe, Tom. I have replied to some of your comments and I'm going to push a fix for the rest of the review. Cheers.

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

Change has no commit message, setting status to needs review.

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

Change successfully merged at revision 7927aadefcc3f0c803496192d565c4d26cd27b7d

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