diff options
author | Michael Klishin <mklishin@pivotal.io> | 2017-03-24 22:21:03 +0300 |
---|---|---|
committer | Michael Klishin <mklishin@pivotal.io> | 2017-03-24 22:21:03 +0300 |
commit | d3934be04b83e69c46f1c2ca0db9a9671cf00511 (patch) | |
tree | 6fafa248adcbb50f80d3ee059cef9ccfa494bad4 /deps/rabbitmq_management/src/rabbit_mgmt_wm_connection.erl | |
parent | 1403a92f4c3981e28fbd21d3605b2178ecb86ac0 (diff) | |
parent | a8eaf48085f1e953eeca0a66256adda0d0f80c6c (diff) | |
download | rabbitmq-server-git-d3934be04b83e69c46f1c2ca0db9a9671cf00511.tar.gz |
Merge branch 'stable'
Conflicts:
src/rabbit_mgmt_util.erl
Diffstat (limited to 'deps/rabbitmq_management/src/rabbit_mgmt_wm_connection.erl')
-rw-r--r-- | deps/rabbitmq_management/src/rabbit_mgmt_wm_connection.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_connection.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_connection.erl index 9a812dddae..cf74b63ec7 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_connection.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_connection.erl @@ -34,7 +34,7 @@ variances(Req, Context) -> {[<<"accept-encoding">>, <<"origin">>], Req, Context}. content_types_provided(ReqData, Context) -> - {[{<<"application/json">>, to_json}], ReqData, Context}. + {rabbit_mgmt_util:responder_map(to_json), ReqData, Context}. allowed_methods(ReqData, Context) -> {[<<"HEAD">>, <<"GET">>, <<"DELETE">>, <<"OPTIONS">>], ReqData, Context}. |