17b94a
From 79c19f0c6d02228aa8cf4b9299afeb7e0b2ad0da Mon Sep 17 00:00:00 2001
17b94a
From: Atin Mukherjee <amukherj@redhat.com>
17b94a
Date: Mon, 16 Apr 2018 17:44:19 +0530
17b94a
Subject: [PATCH 24/52] glusterd: Make localtime-logging option invisible in
17b94a
 downstream
17b94a
17b94a
Label: DOWNSTREAM ONLY
17b94a
17b94a
Change-Id: Ie631edebb7e19152392bfd3c369a96e88796bd75
17b94a
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
17b94a
Reviewed-on: https://code.engineering.redhat.com/gerrit/135754
17b94a
Tested-by: RHGS Build Bot <nigelb@redhat.com>
17b94a
---
17b94a
 xlators/mgmt/glusterd/src/glusterd-op-sm.c      | 2 +-
17b94a
 xlators/mgmt/glusterd/src/glusterd-volume-set.c | 3 ++-
17b94a
 2 files changed, 3 insertions(+), 2 deletions(-)
17b94a
17b94a
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
17b94a
index dd3f9eb..cbbb5d9 100644
17b94a
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
17b94a
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
17b94a
@@ -86,7 +86,7 @@ glusterd_all_vol_opts valid_all_vol_opts[] = {
17b94a
      * TBD: Discuss the default value for this. Maybe this should be a
17b94a
      * dynamic value depending on the memory specifications per node */
17b94a
     {GLUSTERD_BRICKMUX_LIMIT_KEY, GLUSTERD_BRICKMUX_LIMIT_DFLT_VALUE},
17b94a
-    {GLUSTERD_LOCALTIME_LOGGING_KEY, "disable"},
17b94a
+    /*{GLUSTERD_LOCALTIME_LOGGING_KEY, "disable"},*/
17b94a
     {GLUSTERD_DAEMON_LOG_LEVEL_KEY, "INFO"},
17b94a
     {NULL},
17b94a
 };
17b94a
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
17b94a
index 9a6fe9f..fed2864 100644
17b94a
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
17b94a
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
17b94a
@@ -2850,10 +2850,11 @@ struct volopt_map_entry glusterd_volopt_map[] = {
17b94a
                     "to have enabled when clients and/or bricks support "
17b94a
                     "SELinux."},
17b94a
     {.key = GLUSTERD_LOCALTIME_LOGGING_KEY,
17b94a
+    /*{.key = GLUSTERD_LOCALTIME_LOGGING_KEY,
17b94a
      .voltype = "mgmt/glusterd",
17b94a
      .type = GLOBAL_DOC,
17b94a
      .op_version = GD_OP_VERSION_3_12_0,
17b94a
-     .validate_fn = validate_boolean},
17b94a
+     .validate_fn = validate_boolean},*/
17b94a
     {.key = GLUSTERD_DAEMON_LOG_LEVEL_KEY,
17b94a
      .voltype = "mgmt/glusterd",
17b94a
      .type = GLOBAL_NO_DOC,
17b94a
-- 
17b94a
1.8.3.1
17b94a