Merge lp:~corey.bryant/charms/trusty/nova-cloud-controller/git-1531612 into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Proposed by
Corey Bryant
Status: | Merged |
---|---|
Merged at revision: | 208 |
Proposed branch: | lp:~corey.bryant/charms/trusty/nova-cloud-controller/git-1531612 |
Merge into: | lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next |
Diff against target: |
246 lines (+56/-34) 6 files modified
charm-helpers-hooks.yaml (+1/-1) hooks/charmhelpers/contrib/openstack/context.py (+12/-2) hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+3/-2) hooks/charmhelpers/contrib/openstack/utils.py (+6/-9) hooks/charmhelpers/core/host.py (+34/-17) hooks/charmhelpers/fetch/giturl.py (+0/-3) |
To merge this branch: | bzr merge lp:~corey.bryant/charms/trusty/nova-cloud-controller/git-1531612 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email: mp+281962@code.launchpad.net |
To post a comment you must log in.
charm_lint_check #16810 nova-cloud- controller- next for corey.bryant mp281962
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/16810/