Merge lp://staging/~billy-olsen/charm-helpers/stable-juju2-amulet into lp://staging/~openstack-charmers/charm-helpers/stable
Proposed by
Billy Olsen
| Status: | Merged |
|---|---|
| Merged at revision: | 619 |
| Proposed branch: | lp://staging/~billy-olsen/charm-helpers/stable-juju2-amulet |
| Merge into: | lp://staging/~openstack-charmers/charm-helpers/stable |
| 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://staging/~billy-olsen/charm-helpers/stable-juju2-amulet |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| David Ames (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Cherry-pick of r708 updating the juju2 amulet support for run actions.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good. I think I did the original in master :)
Merging.