17b94a
From 83d5ebd6ca68e319db86e310cf072888d0f0f1d1 Mon Sep 17 00:00:00 2001
17b94a
From: Jiffin Tony Thottan <jthottan@redhat.com>
17b94a
Date: Wed, 8 May 2019 10:07:29 +0530
17b94a
Subject: [PATCH 132/141] glusterd: remove duplicate occurrence of
17b94a
 features.selinux from volume option table
17b94a
17b94a
Label : DOWNSTREAM ONLY
17b94a
17b94a
Change-Id: I0a49fece7a1fcbb9f3bbfe5806ec470aeb33ad70
17b94a
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
17b94a
Reviewed-on: https://code.engineering.redhat.com/gerrit/169664
17b94a
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
17b94a
Tested-by: RHGS Build Bot <nigelb@redhat.com>
17b94a
---
17b94a
 xlators/mgmt/glusterd/src/glusterd-volume-set.c | 10 ----------
17b94a
 1 file changed, 10 deletions(-)
17b94a
17b94a
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
17b94a
index 10aa2ae..e52de20 100644
17b94a
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
17b94a
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
17b94a
@@ -3242,16 +3242,6 @@ struct volopt_map_entry glusterd_volopt_map[] = {
17b94a
                     "pages."
17b94a
                     "The max value is 262144 pages i.e 1 GB and "
17b94a
                     "the min value is 1000 pages i.e ~4 MB."},
17b94a
-    {.key = VKEY_FEATURES_SELINUX,
17b94a
-     .voltype = "features/selinux",
17b94a
-     .type = NO_DOC,
17b94a
-     .value = "on",
17b94a
-     .op_version = GD_OP_VERSION_3_11_0,
17b94a
-     .description = "Convert security.selinux xattrs to "
17b94a
-                    "trusted.gluster.selinux on the bricks. Recommended "
17b94a
-                    "to have enabled when clients and/or bricks support "
17b94a
-                    "SELinux."},
17b94a
-
17b94a
 #endif /* USE_GFDB */
17b94a
     {
17b94a
         .key = "locks.trace",
17b94a
-- 
17b94a
1.8.3.1
17b94a