Merge lp:~jjo/juju-deployer/deployer-constraints-fix-subords-and-support-M_G-sizes into lp:juju-deployer
Proposed by
JuanJo Ciarlante
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 84 | ||||
Proposed branch: | lp:~jjo/juju-deployer/deployer-constraints-fix-subords-and-support-M_G-sizes | ||||
Merge into: | lp:juju-deployer | ||||
Diff against target: |
166 lines (+61/-12) 6 files modified
deployer/action/diff.py (+12/-7) deployer/cli.py (+5/-1) deployer/env/go.py (+7/-1) deployer/tests/test_constraints.py (+24/-0) deployer/tests/test_guiserver.py (+1/-0) deployer/utils.py (+12/-3) |
||||
To merge this branch: | bzr merge lp:~jjo/juju-deployer/deployer-constraints-fix-subords-and-support-M_G-sizes | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
juju-deployers | Pending | ||
Review via email: mp+195403@code.launchpad.net |
Commit message
[jjo, r=] constraints fixes + tests: don't fail on subords, parse M/G sizes,
cleanup YAML output from diff by default (--raw-output option to avoid this)
To post a comment you must log in.
thanks. merging, with minor changes (nice unicode output by default using yaml.representer).