Merge lp:~corey.bryant/charm-helpers/enable-next-branches into lp:charm-helpers
Proposed by
Corey Bryant
Status: | Merged |
---|---|
Merged at revision: | 220 |
Proposed branch: | lp:~corey.bryant/charm-helpers/enable-next-branches |
Merge into: | lp:charm-helpers |
Diff against target: |
125 lines (+50/-15) 3 files modified
charmhelpers/contrib/amulet/deployment.py (+10/-9) charmhelpers/contrib/openstack/amulet/deployment.py (+35/-2) charmhelpers/contrib/openstack/amulet/utils.py (+5/-4) |
To merge this branch: | bzr merge lp:~corey.bryant/charm-helpers/enable-next-branches |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Needs Fixing | ||
Review via email: mp+235664@code.launchpad.net |
Description of the change
OpenStack amulet tests are currently broken for the dev branches. This is because we are mixing next branch (the current branch that is being tested) with stable branches (all other charms are branched from the charm store). This patch fixes that.
To post a comment you must log in.
A few comments inline