Merge lp://qastaging/~james-page/charms/trusty/neutron-gateway/lp1531102-trunk into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-gateway/trunk
Proposed by
James Page
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 136 | ||||
Proposed branch: | lp://qastaging/~james-page/charms/trusty/neutron-gateway/lp1531102-trunk | ||||
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-gateway/trunk | ||||
Diff against target: |
533 lines (+207/-39) 6 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) 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-gateway/lp1531102-trunk | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
charmers | Pending | ||
Review via email:
|
Commit message
Resync helpers
Description of the change
Resync stable helpers.
To post a comment you must log in.
charm_lint_check #16737 neutron-gateway for james-page mp281864
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/16737/