Prometheus2 charm

Merge ~xavpaice/charm-prometheus2:bug/1936895 into charm-prometheus2:master

  1. Git
  2. lp:~xavpaice/charm-prometheus2
  3. bug/1936895
  4. Merge into master
Proposed by Xav Paice
Status: Merged
Approved by: James Troup
Approved revision: 2e8a2fd87cc8a10f08363e5194177f1ed267760e
Merged at revision: 72270a0ef541e066aac50a0f593264861e3b3270
Proposed branch: ~xavpaice/charm-prometheus2:bug/1936895
Merge into: charm-prometheus2:master
Diff against target: 7 lines (+1/-1)
1 file modified
src/wheelhouse.txt (+1/-1)
Reviewer Review Type Date Requested Status
Paul Goins Approve
🤖 prod-jenkaas-bootstack continuous-integration Approve
BootStack Reviewers Pending
Review via email: mp+405993@code.staging.launchpad.net

Commit message

Pin python requests to support Python 3.5

In order to maintain Xenial support, we must use a version of requests
that still works with Python 3.5.

Resolves LP:#1936895

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 :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

PASSED: Continuous integration, rev:2e8a2fd87cc8a10f08363e5194177f1ed267760e
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus2-ci/3/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/125/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/326/

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

review: Approve (continuous-integration)
Revision history for this message
Paul Goins (vultaire) wrote :

LGTM

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

Change successfully merged at revision 72270a0ef541e066aac50a0f593264861e3b3270

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: