Merge lp://qastaging/~james-page/charms/trusty/neutron-api/lp1531102-trunk into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/trunk
Proposed by
James Page
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 121 | ||||
Proposed branch: | lp://qastaging/~james-page/charms/trusty/neutron-api/lp1531102-trunk | ||||
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/trunk | ||||
Diff against target: |
606 lines (+275/-39) 7 files modified
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+67/-8) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+25/-3) hooks/charmhelpers/contrib/openstack/utils.py (+21/-17) hooks/charmhelpers/core/hugepage.py (+2/-0) hooks/charmhelpers/core/kernel.py (+68/-0) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+67/-8) tests/charmhelpers/contrib/openstack/amulet/utils.py (+25/-3) |
||||
To merge this branch: | bzr merge lp://qastaging/~james-page/charms/trusty/neutron-api/lp1531102-trunk | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email:
|
Commit message
Resync helpers
Description of the change
Resync helpers to resolve issues with liberty point releases.
To post a comment you must log in.
charm_lint_check #16740 neutron-api for james-page mp281862
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/16740/