Merge lp://staging/~joetalbott/charms/trusty/adt-cloud-service/add_basenode into lp://staging/~canonical-ci-engineering/charms/trusty/adt-cloud-service/trunk
Proposed by
Joe Talbott
| Status: | Merged |
|---|---|
| Approved by: | Joe Talbott |
| Approved revision: | 4 |
| Merged at revision: | 5 |
| Proposed branch: | lp://staging/~joetalbott/charms/trusty/adt-cloud-service/add_basenode |
| Merge into: | lp://staging/~canonical-ci-engineering/charms/trusty/adt-cloud-service/trunk |
| Diff against target: |
93 lines (+19/-5) 4 files modified
config.yaml (+5/-0) hooks/actions.py (+12/-4) hooks/services.py (+1/-0) templates/upstart.conf (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~joetalbott/charms/trusty/adt-cloud-service/add_basenode |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Francis Ginther | Approve | ||
|
Review via email:
|
|||
Commit message
Add basenode support.
Description of the change
Add basenode support.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Approve, consistent with https:/