Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deps/rabbit/src/rabbit_core_ff.erl
Original file line number Diff line number Diff line change
Expand Up @@ -207,14 +207,14 @@
-rabbit_feature_flag(
{'rabbitmq_4.1.0',
#{desc => "Allows rolling upgrades to 4.1.x",
stability => stable,
stability => required,
depends_on => ['rabbitmq_4.0.0']
}}).

-rabbit_feature_flag(
{'rabbitmq_4.2.0',
#{desc => "Allows rolling upgrades to 4.2.x",
stability => stable,
stability => required,
depends_on => ['rabbitmq_4.1.0'],
callbacks => #{enable => {rabbit_khepri, enable_feature_flag}}
}}).
Expand Down
2 changes: 1 addition & 1 deletion deps/rabbit/src/rabbit_exchange_type_local_random.erl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

-rabbit_feature_flag({?MODULE,
#{desc => "Local random exchange",
stability => stable
stability => required
}}).

-rabbit_boot_step({?MODULE,
Expand Down
2 changes: 1 addition & 1 deletion deps/rabbitmq_management/src/rabbit_mgmt_app.erl
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
-rabbit_feature_flag(
{detailed_queues_endpoint,
#{desc => "Add a detailed queues HTTP API endpoint. Reduce number of metrics in the default endpoint.",
stability => stable,
stability => required,
depends_on => [feature_flags_v2]
}}).

Expand Down
2 changes: 1 addition & 1 deletion deps/rabbitmq_mqtt/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ define ct_master.erl
halt(0)
endef

PARALLEL_CT_SET_1_A = auth retainer federation feature_flag disconnect_on_unauthorized
PARALLEL_CT_SET_1_A = auth retainer federation disconnect_on_unauthorized
PARALLEL_CT_SET_1_B = cluster command config config_schema mc_mqtt packet_prop \
processor protocol_interop proxy_protocol rabbit_mqtt_confirms reader util
PARALLEL_CT_SET_1_C = java v5
Expand Down
115 changes: 0 additions & 115 deletions deps/rabbitmq_mqtt/test/feature_flag_SUITE.erl

This file was deleted.

8 changes: 6 additions & 2 deletions deps/rabbitmq_mqtt/test/mqtt_shared_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -647,8 +647,12 @@ events(Config) ->
E2),
assert_event_type(binding_created, E3),
ExpectedBindingArgs = case ?config(mqtt_version, Config) of
v5 -> [{mqtt_subscription_opts, Qos, false, false, 0, undefined},
{<<"x-binding-key">>, longstr, AmqpTopic}];
v5 -> [{<<"x-binding-key">>, longstr, AmqpTopic},
{<<"x-mqtt-subscription-opts">>, table,
[{<<"no-local">>, bool, false},
{<<"qos">>, unsignedbyte, Qos},
{<<"retain-as-published">>, bool, false},
{<<"retain-handling">>, unsignedbyte, 0}]}];
_ -> []
end,
assert_event_prop([{source_name, <<"amq.topic">>},
Expand Down
Loading