Merge lp://qastaging/~thedac/charm-helpers/amulet-juju2 into lp://qastaging/charm-helpers
Proposed by
David Ames
Status: | Merged |
---|---|
Merged at revision: | 708 |
Proposed branch: | lp://qastaging/~thedac/charm-helpers/amulet-juju2 |
Merge into: | lp://qastaging/charm-helpers |
Diff against target: |
196 lines (+42/-84) 2 files modified
charmhelpers/contrib/amulet/utils.py (+11/-18) tests/contrib/amulet/test_utils.py (+31/-66) |
To merge this branch: | bzr merge lp://qastaging/~thedac/charm-helpers/amulet-juju2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stuart Bishop (community) | Approve | ||
charmers | Pending | ||
Review via email: mp+318551@code.qastaging.launchpad.net |
Description of the change
Fix Juju 2.x support for amulet utils
The command structure for juju actions changed dramatically from 1.x
to 2.x. Fix the handling for action to support both versions.
To post a comment you must log in.
juju_version and juju_has_version already exist in charmhelpers. core.hookenv