Merge lp://qastaging/~james-page/charms/trusty/nova-compute/kilo into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Proposed by
James Page
Status: | Merged |
---|---|
Merged at revision: | 109 |
Proposed branch: | lp://qastaging/~james-page/charms/trusty/nova-compute/kilo |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next |
Diff against target: |
227 lines (+91/-12) 10 files modified
.pydevproject (+2/-2) hooks/charmhelpers/contrib/openstack/context.py (+12/-1) hooks/charmhelpers/contrib/openstack/neutron.py (+2/-1) hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken (+9/-0) hooks/charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo (+22/-0) hooks/charmhelpers/core/hookenv.py (+26/-0) hooks/charmhelpers/core/host.py (+5/-1) hooks/charmhelpers/core/services/helpers.py (+2/-2) templates/kilo/nova.conf (+7/-5) templates/parts/section-database (+4/-0) |
To merge this branch: | bzr merge lp://qastaging/~james-page/charms/trusty/nova-compute/kilo |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email:
|
To post a comment you must log in.
charm_lint_check #2884 nova-compute-next for james-page mp254052
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/2884/