Merge lp://qastaging/~corey.bryant/charms/trusty/openstack-dashboard/git-1531612 into lp://qastaging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

Proposed by Corey Bryant
Status: Merged
Merged at revision: 99
Proposed branch: lp://qastaging/~corey.bryant/charms/trusty/openstack-dashboard/git-1531612
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next
Diff against target: 244 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://qastaging/~corey.bryant/charms/trusty/openstack-dashboard/git-1531612
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+281999@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #16832 openstack-dashboard-next for corey.bryant mp281999
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/16832/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #15718 openstack-dashboard-next for corey.bryant mp281999
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/15718/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #8603 openstack-dashboard-next for corey.bryant mp281999
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8603/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches