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