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

[David Planella]

- 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

Unmerged revisions

3. By David Planella on 2016-06-03

Added metadata

=== modified file 'layer.yaml'
--- layer.yaml	2015-11-23 18:46:14 +0000
+++ layer.yaml	2016-06-03 14:55:06 +0000
@@ -1,1 +1,2 @@
 includes: ['layer:django', 'layer:nginx']
+repo: bzr+ssh://bazaar.launchpad.net/~ubucon-site-developers/ubucon-site/ubucon-layer/
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-11-23 18:46:14 +0000
+++ metadata.yaml	2016-06-03 14:55:06 +0000
@@ -1,6 +1,7 @@
 name: ubucon
 summary: UbuCon.org website
 description: UbuCon.org website
+series: ['trusty']
 maintainers:
   - Marco Ceppi <[e-mail]>
   - ubucon-site-developers <[e-mail]>