Merge lp://staging/~wesmason/charms/trusty/conn-check/remove-ppa into lp://staging/~ubuntuone-hackers/charms/trusty/conn-check/trunk
Proposed by
Wes Mason
Status: | Merged |
---|---|
Approved by: | Simon Davy |
Approved revision: | 45 |
Merged at revision: | 45 |
Proposed branch: | lp://staging/~wesmason/charms/trusty/conn-check/remove-ppa |
Merge into: | lp://staging/~ubuntuone-hackers/charms/trusty/conn-check/trunk |
Diff against target: |
27 lines (+1/-8) 2 files modified
config.yaml (+0/-7) hooks/hooks.py (+1/-1) |
To merge this branch: | bzr merge lp://staging/~wesmason/charms/trusty/conn-check/remove-ppa |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Simon Davy (community) | Approve | ||
Review via email:
|
Commit message
Remove PPA option and always set from_ppa to False
Description of the change
As discussed with Simon/Michael, removing the PPA option from config, and always setting from_ppa=False, for Ansible, as we're fine with what's in trusty repos, and the option was most likely set (or merged) accidentally during precise branch work.
To post a comment you must log in.