charm-juju-lxd

Merge ~jillrouleau/charm-juju-lxd:charm_test_packages into charm-juju-lxd:master

  1. Git
  2. lp:~jillrouleau/charm-juju-lxd
  3. charm_test_packages
  4. Merge into master
Proposed by Jill Rouleau
Status: Merged
Merge reported by: Alvaro Uria
Merged at revision: 3b6da32f4c2f0596936a8c5d349c42a9eb9814cc
Proposed branch: ~jillrouleau/charm-juju-lxd:charm_test_packages
Merge into: charm-juju-lxd:master
Diff against target: 24 lines (+8/-0)
1 file modified
layer.yaml (+8/-0)
Reviewer Review Type Date Requested Status
Drew Freiberger (community) Approve
Review via email: mp+335593@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Drew Freiberger (afreiberger) wrote :

please update in layer.yaml instead to install tox with the apt layer and "charm" with the snap layer

review: Needs Fixing
Revision history for this message
Drew Freiberger (afreiberger) wrote :

lgtm. merging

review: Approve

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 7a9a464..aa86d9e 100644
3--- a/layer.yaml
4+++ b/layer.yaml
5@@ -14,6 +14,13 @@ options:
6 dangerous: false
7 classic: true
8 revision: null
9+ charm-tools:
10+ channel: stable
11+ devmode: false
12+ jailmode: false
13+ dangerous: false
14+ classic: true
15+ revision: null
16 apt:
17 packages:
18 - zfsutils-linux
19@@ -25,4 +32,5 @@ options:
20 - python-openstackclient
21 - git
22 - bzr
23+ - tox
24 repo: https://code.launchpad.net/~afreiberger/+git/charm-juju-lxd

Subscribers

People subscribed via source and target branches

to all changes: