Merge lp://staging/~barryprice/charm-haproxy/trunk into lp://staging/charm-haproxy

Proposed by Barry Price
Status: Merged
Approved by: Tom Haddon
Approved revision: no longer in the source branch.
Merged at revision: 121
Proposed branch: lp://staging/~barryprice/charm-haproxy/trunk
Merge into: lp://staging/charm-haproxy
Diff against target: 28 lines (+10/-1)
1 file modified
hooks/hooks.py (+10/-1)
To merge this branch: bzr merge lp://staging/~barryprice/charm-haproxy/trunk
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Review via email: mp+364720@code.staging.launchpad.net

Commit message

Compare new service ports against currently-opened ports instead of potentially-opened ports

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.

120. By Barry Price

Drop cm.py (which was pulling the obsolete LP Bazaar repo), use curl to pull in the latest charm-helpers sync script from github

Reviewed-on: https://code.launchpad.net/~barryprice/charm-haproxy/charmhelpers-git/+merge/364737
Reviewed-by: Stuart Bishop <email address hidden>

Revision history for this message
Tom Haddon (mthaddon) wrote :

One comment inline

review: Needs Information
Revision history for this message
Joel Sing (jsing) :
Revision history for this message
Barry Price (barryprice) wrote :

Response inline, updated code to follow

Revision history for this message
Joel Sing (jsing) :
Revision history for this message
Tom Haddon (mthaddon) wrote :

LGTM, thanks

review: Approve
121. By Barry Price

Compare new service ports against currently-opened ports instead of potentially-opened ports

Reviewed-on: https://code.launchpad.net/~barryprice/charm-haproxy/trunk/+merge/364720
Reviewed-by: Tom Haddon <email address hidden>

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

Change successfully merged at revision 121

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: