Merge ~jneo8/charm-prometheus-openstack-exporter:build/juju-3.1 into charm-prometheus-openstack-exporter:master

Proposed by JamesLin
Status: Merged
Approved by: Eric Chen
Approved revision: d202e8e9cb5e46d7f1b5fc5737ca4811b64dda82
Merged at revision: a88f18c7ad3bae6a72fbcd37da0363ec83200507
Proposed branch: ~jneo8/charm-prometheus-openstack-exporter:build/juju-3.1
Merge into: charm-prometheus-openstack-exporter:master
Diff against target: 11 lines (+2/-2)
1 file modified
src/tests/functional/requirements.txt (+2/-2)
Reviewer Review Type Date Requested Status
Tianqi Xiao (community) Approve
Eric Chen Approve
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
Review via email: mp+453028@code.launchpad.net

Commit message

build(juju-3.1): Change zaza dependency to branch libjuju-3.1

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 :
review: Approve (continuous-integration)
Revision history for this message
Eric Chen (eric-chen) wrote :

LGTM.
Please wait 3 more days
https://github.com/openstack-charmers/zaza/pull/608
If it is merged, we can drop this MR.

review: Approve
Revision history for this message
Tianqi Xiao (txiao) wrote :

LGTM

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

Change successfully merged at revision a88f18c7ad3bae6a72fbcd37da0363ec83200507

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/tests/functional/requirements.txt b/src/tests/functional/requirements.txt
2index 593ef44..87b690a 100644
3--- a/src/tests/functional/requirements.txt
4+++ b/src/tests/functional/requirements.txt
5@@ -1,3 +1,3 @@
6-git+https://github.com/openstack-charmers/zaza.git#egg=zaza
7+git+https://github.com/openstack-charmers/zaza.git@libjuju-3.1#egg=zaza
8 requests<2.25.0
9-python-openstackclient
10\ No newline at end of file
11+python-openstackclient

Subscribers

People subscribed via source and target branches

to all changes: