Merge lp:~fginther/charms/precise/juju-local/switch-to-tarmac-ppa into lp:~canonical-ci-engineering/charms/precise/juju-local/trunk

Proposed by Francis Ginther
Status: Needs review
Proposed branch: lp:~fginther/charms/precise/juju-local/switch-to-tarmac-ppa
Merge into: lp:~canonical-ci-engineering/charms/precise/juju-local/trunk
Diff against target: 21 lines (+2/-2)
1 file modified
config.yaml (+2/-2)
To merge this branch: bzr merge lp:~fginther/charms/precise/juju-local/switch-to-tarmac-ppa
Reviewer Review Type Date Requested Status
Canonical CI Engineering Pending
Review via email: mp+242538@code.launchpad.net

Commit message

Switch to the ppa:canonical-ci-engineering/tarmac-juju for juju packages.

Description of the change

Switch to the ppa:canonical-ci-engineering/tarmac-juju for juju packages.

To post a comment you must log in.

Unmerged revisions

19. By Francis Ginther

Switch to the ppa:canonical-ci-engineering/tarmac-juju for juju packages.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'config.yaml'
--- config.yaml 2014-11-18 21:20:17 +0000
+++ config.yaml 2014-11-21 20:34:14 +0000
@@ -1,7 +1,7 @@
1options:1options:
2 install_sources:2 install_sources:
3 type: string3 type: string
4 default: '- ppa:juju/stable'4 default: '- ppa:canonical-ci-engineering/tarmac-juju'
5 description: |5 description: |
6 YAML list of additional installation sources, as a string. The number of6 YAML list of additional installation sources, as a string. The number of
7 install_sources must match the number of install_keys. For example:7 install_sources must match the number of install_keys. For example:
@@ -10,7 +10,7 @@
10 - ppa:project2/ppa10 - ppa:project2/ppa
11 install_keys:11 install_keys:
12 type: string12 type: string
13 default: '- "C8068B11"'13 default: '- "6A8DFC40"'
14 description: |14 description: |
15 YAML list of GPG keys for installation sources, as a string. For apt15 YAML list of GPG keys for installation sources, as a string. For apt
16 repository URLs, use the public key ID used to verify package signatures.16 repository URLs, use the public key ID used to verify package signatures.

Subscribers

People subscribed via source and target branches