Merge lp://qastaging/~corey.bryant/charms/trusty/nova-compute/git-1531612 into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Proposed by
Corey Bryant
Status: | Merged |
---|---|
Merged at revision: | 189 |
Proposed branch: | lp://qastaging/~corey.bryant/charms/trusty/nova-compute/git-1531612 |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next |
Diff against target: |
322 lines (+129/-34) 7 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) hooks/charmhelpers/payload/archive.py (+73/-0) |
To merge this branch: | bzr merge lp://qastaging/~corey.bryant/charms/trusty/nova-compute/git-1531612 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenStack Charmers | Pending | ||
Review via email:
|
To post a comment you must log in.
charm_lint_check #16806 nova-compute-next for corey.bryant mp281961
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/16806/