Merge pull request #1412 from rabbitmq/rabbitmq-server-1411rabbitmq_v3_6_13_rc1

Accept strings and atoms for queue_master_locator setting

1 files changed, 3 insertions, 2 deletions

diff --git a/src/rabbit_queue_location_validator.erl b/src/rabbit_queue_location_validator.erl
index 2b0f8c7a0f..e70bcd314a 100644
--- a/src/rabbit_queue_location_validator.erl
+++ b/src/rabbit_queue_location_validator.erl
@@ -54,7 +54,6 @@ module(#amqqueue{} = Q) ->
         undefined -> no_location_strategy;
         Mode      -> module(Mode)
     end;
-
 module(Strategy) when is_binary(Strategy) ->
     case rabbit_registry:binary_to_type(Strategy) of
         {error, not_found} -> no_location_strategy;
@@ -68,4 +67,6 @@ module(Strategy) when is_binary(Strategy) ->
                 _            ->
                     no_location_strategy
             end
-    end.
+    end;
+module(Strategy) ->
+    module(rabbit_data_coercion:to_binary(Strategy)).