Merge lp://qastaging/~james-page/charms/trusty/keystone/lp1531102-trunk into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/trunk
Proposed by
James Page
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 158 | ||||
| Proposed branch: | lp://qastaging/~james-page/charms/trusty/keystone/lp1531102-trunk | ||||
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/trunk | ||||
| Diff against target: |
834 lines (+419/-44) 11 files modified
charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1) charmhelpers/contrib/openstack/amulet/utils.py (+26/-4) charmhelpers/contrib/openstack/context.py (+40/-13) charmhelpers/contrib/openstack/neutron.py (+17/-3) charmhelpers/contrib/openstack/templates/ceph.conf (+6/-0) charmhelpers/contrib/openstack/utils.py (+22/-17) charmhelpers/core/host.py (+12/-1) charmhelpers/core/hugepage.py (+2/-0) charmhelpers/core/kernel.py (+68/-0) 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/keystone/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 stable helpers to resolve liberty point release issues.
To post a comment you must log in.
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
charm_lint_check #16734 keystone for james-page mp281868
LINT OK: passed
Build: http://