Merge lp://qastaging/~corey.bryant/charms/trusty/nova-compute/sync-charm-helpers into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Proposed by
Corey Bryant
| Status: | Merged |
|---|---|
| Merged at revision: | 74 |
| Proposed branch: | lp://qastaging/~corey.bryant/charms/trusty/nova-compute/sync-charm-helpers |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next |
| Diff against target: |
696 lines (+273/-88) 7 files modified
hooks/charmhelpers/contrib/hahelpers/cluster.py (+9/-0) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+13/-7) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+86/-20) tests/charmhelpers/contrib/amulet/deployment.py (+20/-7) tests/charmhelpers/contrib/amulet/utils.py (+46/-27) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+13/-7) tests/charmhelpers/contrib/openstack/amulet/utils.py (+86/-20) |
| To merge this branch: | bzr merge lp://qastaging/~corey.bryant/charms/trusty/nova-compute/sync-charm-helpers |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
The amulet tests are broken without this.
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
