Merge lp:~adam-collard/charms/trusty/landscape-client/landscape-client-multiple-juju-files into lp:charms/trusty/landscape-client
Status: | Merged |
---|---|
Approved by: | Adam Collard |
Approved revision: | 46 |
Merged at revision: | 39 |
Proposed branch: | lp:~adam-collard/charms/trusty/landscape-client/landscape-client-multiple-juju-files |
Merge into: | lp:charms/trusty/landscape-client |
Diff against target: |
241 lines (+81/-20) 3 files modified
hooks/common.py (+25/-3) hooks/hooks.py (+28/-11) hooks/test_hooks.py (+28/-6) |
To merge this branch: | bzr merge lp:~adam-collard/charms/trusty/landscape-client/landscape-client-multiple-juju-files |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Данило Шеган (community) | Approve | ||
Geoff Teale (community) | Approve | ||
Adam Collard | Abstain | ||
Review via email: mp+223040@code.launchpad.net |
This proposal supersedes a proposal from 2014-06-12.
Commit message
Let the charm output several juju-info JSON files instead of a single file, since the landscape client charm can be deployed to several machines that are "hulk-smashed" together on the same physical machine.
Description of the change
This branch lets the charm output several juju-info JSON files instead of a single file, since the landscape client charm can be deployed to several machines that are "hulk-smashed" together on the same physical machine.
I forked it from lp:~tribaal/charms/trusty/landscape-client/landscape-client-multiple-juju-files because it's blocking my work on lp:1326261
For testing you can do something like this:
PYTHONPATH=
Looks good! Inline comment below, but otherwise +1