charm-haproxy

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

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

Commit message

Actually append the port to the list...

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
Tom Haddon (mthaddon) wrote :

LGTM

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

Change successfully merged at revision 124

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/hooks.py'
2--- hooks/hooks.py 2019-03-20 10:53:55 +0000
3+++ hooks/hooks.py 2019-03-21 10:59:46 +0000
4@@ -944,6 +944,7 @@
5 # but we just want the port numbers, as ints
6 if port_plus_proto.endswith('/tcp') or port_plus_proto.endswith('/udp'):
7 port_only = port_plus_proto[:-4]
8+ old_service_ports.append(port_only)
9 else:
10 raise ValueError('{} is not a valid port/proto value'.format(port_plus_proto))
11

Subscribers

People subscribed via source and target branches

to all changes: