Merge lp:~canonical-ci-engineering/charms/trusty/adt-cloud-worker/make-config-file-explicit into lp:~canonical-ci-engineering/charms/trusty/adt-cloud-worker/trunk
Proposed by
Thomi Richards
Status: | Merged |
---|---|
Approved by: | Thomi Richards |
Approved revision: | 14 |
Merged at revision: | 14 |
Proposed branch: | lp:~canonical-ci-engineering/charms/trusty/adt-cloud-worker/make-config-file-explicit |
Merge into: | lp:~canonical-ci-engineering/charms/trusty/adt-cloud-worker/trunk |
Diff against target: |
24 lines (+2/-2) 2 files modified
hooks/actions.py (+1/-1) templates/upstart.conf (+1/-1) |
To merge this branch: | bzr merge lp:~canonical-ci-engineering/charms/trusty/adt-cloud-worker/make-config-file-explicit |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Francis Ginther | Approve | ||
Celso Providelo (community) | Approve | ||
Review via email: mp+253117@code.launchpad.net |
Commit message
Be explicit about the config file we use.
Description of the change
Be explicit about the config file we use.
To post a comment you must log in.
LGTM