Merge PR ceph#31818 into master

* refs/pull/31818/head: common/options: remove unused ms_msgr2_{sign,encrypt}_messages Reviewed-by: Sage Weil <[email protected]> Reviewed-by: Jason Dillaman <[email protected]>
joskid · Nov 24, 2019 · 7d4675d · 7d4675d
2 parents c30c1a6 + 976d318
commit 7d4675d
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/src/common/options.cc b/src/common/options.cc
@@ -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)")