Merge lp:~hopem/charms/trusty/rabbitmq-server/lp1510902-stable-backport into lp:charms/trusty/rabbitmq-server

Proposed by Edward Hope-Morley on 2015-10-29
Status: Merged
Merged at revision: 108
Proposed branch: lp:~hopem/charms/trusty/rabbitmq-server/lp1510902-stable-backport
Merge into: lp:charms/trusty/rabbitmq-server
Diff against target: 12 lines (+2/-1)
1 file modified
hooks/rabbitmq_server_relations.py (+2/-1)
To merge this branch: bzr merge lp:~hopem/charms/trusty/rabbitmq-server/lp1510902-stable-backport
Reviewer Review Type Date Requested Status
David Ames 2015-10-29 Approve on 2015-10-29
Review via email: mp+276115@code.launchpad.net
To post a comment you must log in.

charm_lint_check #12855 rabbitmq-server for hopem mp276115
    LINT OK: passed

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

charm_unit_test #11936 rabbitmq-server for hopem mp276115
    UNIT OK: passed

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

charm_amulet_test #7648 rabbitmq-server for hopem mp276115
    AMULET OK: passed

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

David Ames (thedac) wrote :

Approved, merging.

review: Approve
David Ames (thedac) wrote :

Whoops. I can't merge this one. Approval stands.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/rabbitmq_server_relations.py'
2--- hooks/rabbitmq_server_relations.py 2015-10-22 13:24:30 +0000
3+++ hooks/rabbitmq_server_relations.py 2015-10-29 12:11:46 +0000
4@@ -172,7 +172,8 @@
5 # NOTE: active/active case
6 if config('prefer-ipv6'):
7 relation_settings = {'private-address': host_addr}
8- relation_set(relation_settings=relation_settings)
9+ relation_set(relation_id=relation_id,
10+ relation_settings=relation_settings)
11
12 return
13

Subscribers

People subscribed via source and target branches