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

[Edward Hope-Morley]

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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)]

Approved, merging.

review: Approve

[David Ames (thedac)]

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

=== modified file 'hooks/rabbitmq_server_relations.py'
--- hooks/rabbitmq_server_relations.py	2015-10-22 13:24:30 +0000
+++ hooks/rabbitmq_server_relations.py	2015-10-29 12:11:46 +0000
@@ -172,7 +172,8 @@
         # NOTE: active/active case
         if config('prefer-ipv6'):
             relation_settings = {'private-address': host_addr}
-            relation_set(relation_settings=relation_settings)
+            relation_set(relation_id=relation_id,
+                         relation_settings=relation_settings)
 
         return