Merge lp:~dpm/ubucon-site/ubucon-layer into lp:ubucon-site/ubucon-layer

Proposed by David Planella on 2016-06-03
Status: Needs review
Proposed branch: lp:~dpm/ubucon-site/ubucon-layer
Merge into: lp:ubucon-site/ubucon-layer
Diff against target: 18 lines (+2/-0)
2 files modified
layer.yaml (+1/-0)
metadata.yaml (+1/-0)
To merge this branch: bzr merge lp:~dpm/ubucon-site/ubucon-layer
Reviewer Review Type Date Requested Status
UbuCon site developers 2016-06-03 Pending
Review via email: mp+296444@code.launchpad.net

Description of the change

- Added repo key to layer config for `charm build` not to complain
- Added series key to metadata so that a series does not need to be explicitly specified on deployment

To post a comment you must log in.

Unmerged revisions

3. By David Planella on 2016-06-03

Added metadata

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'layer.yaml'
2--- layer.yaml 2015-11-23 18:46:14 +0000
3+++ layer.yaml 2016-06-03 14:55:06 +0000
4@@ -1,1 +1,2 @@
5 includes: ['layer:django', 'layer:nginx']
6+repo: bzr+ssh://bazaar.launchpad.net/~ubucon-site-developers/ubucon-site/ubucon-layer/
7
8=== modified file 'metadata.yaml'
9--- metadata.yaml 2015-11-23 18:46:14 +0000
10+++ metadata.yaml 2016-06-03 14:55:06 +0000
11@@ -1,6 +1,7 @@
12 name: ubucon
13 summary: UbuCon.org website
14 description: UbuCon.org website
15+series: ['trusty']
16 maintainers:
17 - Marco Ceppi <marco@ceppi.net>
18 - ubucon-site-developers <community@ubuntu.com>

Subscribers

People subscribed via source and target branches