root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Resolve a conflict (#9156)

This commit is contained in:
Michael Klishin 2023-08-23 12:46:35 +04:00
parent 922e769bcc
commit 525b9bbf1e
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deps/rabbitmq_management/src/rabbit_mgmt_features.erl vendored
View File

@ -7,13 +7,8 @@
-module(rabbit_mgmt_features).
<<<<<<< HEAD
-export([is_op_policy_updating_disabled/0]).
=======
-export([is_op_policy_updating_disabled/0,
is_qq_replica_operations_disabled/0,
are_stats_enabled/0]).
>>>>>>> 2d74d24b80 (Disable add/delete/shrink/grow QQ operations via HTTP api)
is_qq_replica_operations_disabled/0]).
is_qq_replica_operations_disabled() ->
get_restriction([quorum_queue_replica_operations, disabled]).