charm-haproxy

Merge lp://staging/~martin-hilton/charm-haproxy/add-userlists-support into lp://staging/charm-haproxy

  1. add-userlists-support
  2. Merge into trunk
Proposed by Martin Hilton
Status: Merged
Approved by: Joel Sing
Approved revision: 113
Merged at revision: 131
Proposed branch: lp://staging/~martin-hilton/charm-haproxy/add-userlists-support
Merge into: lp://staging/charm-haproxy
Diff against target: 189 lines (+97/-6)
4 files modified
config.yaml (+25/-0)
hooks/hooks.py (+31/-6)
hooks/tests/test_config_changed_hooks.py (+2/-0)
hooks/tests/test_helpers.py (+39/-0)
To merge this branch: bzr merge lp://staging/~martin-hilton/charm-haproxy/add-userlists-support
Reviewer Review Type Date Requested Status
Joel Sing (community) +1 Approve
Stuart Bishop (community) Approve
Review via email: mp+367581@code.staging.launchpad.net

Commit message

Add userlist support

Description of the change

This is a copy of https://code.launchpad.net/~evarlast/charm-haproxy/add-userlists-support/+merge/317418 with the suggested review changes applied.

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Stuart Bishop (stub) wrote :

All looks good with the updates per previous review

review: Approve
Revision history for this message
Joel Sing (jsing) wrote :

LGTM - the other option would be to allow an arbitrary block of haproxy configuration to be passed through, however this approach is more inline with the config style already in use for services.

review: Approve (+1)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 131

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

to all changes: