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