Merge lp://staging/~james-page/charms/trusty/glance/lp1531102-trunk into lp://staging/~openstack-charmers-archive/charms/trusty/glance/trunk
Proposed by
James Page
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 126 | ||||
Proposed branch: | lp://staging/~james-page/charms/trusty/glance/lp1531102-trunk | ||||
Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/glance/trunk | ||||
Diff against target: |
671 lines (+325/-35) 9 files modified
charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1) charmhelpers/contrib/openstack/amulet/utils.py (+25/-3) charmhelpers/contrib/openstack/context.py (+25/-9) charmhelpers/contrib/openstack/neutron.py (+14/-0) charmhelpers/contrib/openstack/utils.py (+22/-17) charmhelpers/core/host.py (+12/-1) charmhelpers/core/hugepage.py (+2/-0) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1) tests/charmhelpers/contrib/openstack/amulet/utils.py (+25/-3) |
||||
To merge this branch: | bzr merge lp://staging/~james-page/charms/trusty/glance/lp1531102-trunk | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email: mp+281863@code.staging.launchpad.net |
Commit message
Resync helpers
Description of the change
Resync stable helpers to resolve liberty point release issues.
To post a comment you must log in.
charm_unit_test #15633 glance for james-page mp281863
UNIT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_unit_ test/15633/