Merge lp://qastaging/~free.ekanayaka/charms/trusty/landscape-client/drop-unit-name-from-juju-info into lp://qastaging/~landscape/charms/trusty/landscape-client/trunk
Proposed by
Free Ekanayaka
| Status: | Merged |
|---|---|
| Approved by: | Free Ekanayaka |
| Approved revision: | 47 |
| Merged at revision: | 46 |
| Proposed branch: | lp://qastaging/~free.ekanayaka/charms/trusty/landscape-client/drop-unit-name-from-juju-info |
| Merge into: | lp://qastaging/~landscape/charms/trusty/landscape-client/trunk |
| Diff against target: |
229 lines (+25/-68) 3 files modified
hooks/common.py (+4/-8) hooks/hooks.py (+11/-28) hooks/test_hooks.py (+10/-32) |
| To merge this branch: | bzr merge lp://qastaging/~free.ekanayaka/charms/trusty/landscape-client/drop-unit-name-from-juju-info |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chris Glass (community) | Approve | ||
| Alberto Donato (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This branch drops the unit-name field from the content of the juju info file, and changes the code to generate a single json file as opposed to one per principal unit, since we now only need the machine->computer association.
To post a comment you must log in.
Revision history for this message
| Free Ekanayaka (free.ekanayaka) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM, +1
One question inline.
#1:
I think we could drop "private-address" too. It's optional in the message and we don't use it on the server.