Merge PR #31818 into master

* refs/pull/31818/head:
	common/options: remove unused ms_msgr2_{sign,encrypt}_messages

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Sage Weil 2019-11-23 20:27:00 -06:00
commit 7d4675de7c

View File

@ -975,16 +975,6 @@ std::vector<Option> get_global_options() {
.set_default(100_M)
.set_description("Limit messages that are read off the network but still being processed"),
Option("ms_msgr2_sign_messages", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
.set_default(false)
.set_description("Sign msgr2 frames' payload")
.add_see_also("ms_msgr2_encrypt_messages"),
Option("ms_msgr2_encrypt_messages", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
.set_default(false)
.set_description("Encrypt msgr2 frames' payload")
.add_see_also("ms_msgr2_sign_messages"),
Option("ms_bind_ipv4", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
.set_default(true)
.set_description("Bind servers to IPv4 address(es)")