« back to all changes in this revision
Viewing changes to tests/image_builder/
- Committer: Vincent Ladeuil
- Date: 2014-02-20 10:20:41 UTC
- mfrom: (217.2.36 ubuntu-ci-services-itself)
- Revision ID: vila+ci@canonical.com-20140220102041-j4b3cndgskrmq8kl
Merge trunk resolving conflicts
- files added:
- cli/tests/data/foobar_0.1-1_dsc.changes
- tests/image_builder
- files renamed:
- juju-deployer/lander.yaml => juju-deployer/lander.yaml.tmpl
- juju-deployer/ppa-assigner.yaml => juju-deployer/ppa-assigner.yaml.tmpl
- juju-deployer/ticket-system.yaml => juju-deployer/ticket-system.yaml.tmpl
- files modified:
- README
- charms/precise/lander-jenkins/hooks/install
added
removed
tests/image_builder/
