Merge lp://qastaging/~corey.bryant/charms/trusty/nova-cloud-controller/sync-charm-helpers into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Proposed by
Corey Bryant
Status: | Merged |
---|---|
Merged at revision: | 90 |
Proposed branch: | lp://qastaging/~corey.bryant/charms/trusty/nova-cloud-controller/sync-charm-helpers |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next |
Diff against target: |
689 lines (+265/-89) 7 files modified
Makefile (+1/-1) 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-cloud-controller/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.