Merge lp://qastaging/~mbruzek/charms/trusty/consul/trunk into lp://qastaging/~zoology/charms/trusty/consul/trunk
Proposed by
Matt Bruzek
| Status: | Merged |
|---|---|
| Merged at revision: | 2 |
| Proposed branch: | lp://qastaging/~mbruzek/charms/trusty/consul/trunk |
| Merge into: | lp://qastaging/~zoology/charms/trusty/consul/trunk |
| Diff against target: |
166 lines (+24/-29) 5 files modified
config.yaml (+1/-1) files/default.json (+1/-0) hooks/consul.py (+17/-18) hooks/hooks.py (+2/-2) tests/10-deploy.py (+3/-8) |
| To merge this branch: | bzr merge lp://qastaging/~mbruzek/charms/trusty/consul/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chris MacNaughton (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
I updated the charm to get the resources from a release stream.
The way that the UI has also changed.
To post a comment you must log in.
Revision history for this message
| Chris MacNaughton (chris.macnaughton) wrote | # |
Revision history for this message
| Chris MacNaughton (chris.macnaughton) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Tests pass and changes look good to me, +1!