Merge ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master into ~livepatch-charmers/charm-canonical-livepatch:master

Proposed by Barry Price
Status: Merged
Approved by: Haw Loeung
Approved revision: 6c58f16f9036ece7a77676e7fe69f00eee57b457
Merged at revision: 9dc8a5ed23d41bf04e91c5170bc61f5729c06120
Proposed branch: ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master
Merge into: ~livepatch-charmers/charm-canonical-livepatch:master
Diff against target: 16 lines (+1/-7)
1 file modified
layer.yaml (+1/-7)
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
Review via email: mp+355288@code.launchpad.net

Commit message

Remove workaround for charms.reactive #82

Also correct repo format

To post a comment you must log in.
Revision history for this message
Stuart Bishop (stub) wrote :

Yup

review: Approve
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 9dc8a5ed23d41bf04e91c5170bc61f5729c06120

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/layer.yaml b/layer.yaml
2index 5f1849f..0fd758a 100644
3--- a/layer.yaml
4+++ b/layer.yaml
5@@ -6,10 +6,4 @@ options:
6 basic:
7 use_venv: true
8 include_system_packages: true
9- packages:
10- # we need to specify these here due to https://github.com/juju-solutions/charms.reactive/issues/82
11- - build-essential
12- - python3-setuptools
13- - python3-wheel
14- - python3-yaml
15-repo: lp:~livepatch-charmers/canonical-livepatch-charm/+git/canonical-livepatch-charm
16+repo: https://git.launchpad.net/canonical-livepatch-charm

Subscribers

People subscribed via source and target branches