Merge lp://qastaging/~james-page/charms/trusty/heat/lp1531102-trunk into lp://qastaging/~openstack-charmers-archive/charms/trusty/heat/trunk
Proposed by
James Page
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 48 | ||||
Proposed branch: | lp://qastaging/~james-page/charms/trusty/heat/lp1531102-trunk | ||||
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/heat/trunk | ||||
Diff against target: |
1024 lines (+506/-61) 13 files modified
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+26/-4) hooks/charmhelpers/contrib/openstack/context.py (+40/-13) hooks/charmhelpers/contrib/openstack/neutron.py (+17/-3) hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+6/-0) hooks/charmhelpers/contrib/openstack/utils.py (+30/-18) hooks/charmhelpers/core/hookenv.py (+32/-0) hooks/charmhelpers/core/host.py (+12/-1) hooks/charmhelpers/core/hugepage.py (+2/-0) hooks/charmhelpers/core/kernel.py (+68/-0) tests/charmhelpers/contrib/amulet/utils.py (+47/-16) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1) tests/charmhelpers/contrib/openstack/amulet/utils.py (+26/-4) |
||||
To merge this branch: | bzr merge lp://qastaging/~james-page/charms/trusty/heat/lp1531102-trunk | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email: mp+281869@code.qastaging.launchpad.net |
Commit message
Resync helpers
Description of the change
Resync stable helpers to resolve issues with liberty point release detection.
To post a comment you must log in.
charm_unit_test #15627 heat for james-page mp281869
UNIT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_unit_ test/15627/