Viewing all changes in revision 16.1.1.
- Committer: Andreas Hasenack
- Date: 2016-07-22 13:43:06 UTC
- mfrom: (2.1.26 bundles-trunk)
- mto: This revision was merged to the branch mainline in revision 17.
- Revision ID: andreas@canonical.com-20160722134306-h2sjjo4bsfrhuv25
Merged from bundles-trunk:
- resolved conflicts
- pulled out xenial changes, leaving the bundle on trusty and like it is
in the charm store right now
- resolved conflicts
- pulled out xenial changes, leaving the bundle on trusty and like it is
in the charm store right now
- files added:
- .bzrignore
- files removed:
- landscape-dense-maas.yaml
- files modified:
- Makefile
expand all
collapse all
added
removed
