|
 |
d1681e |
From b37253008e93571088537d77282d985b484302c8 Mon Sep 17 00:00:00 2001
|
|
|
d1681e |
From: Atin Mukherjee <amukherj@redhat.com>
|
|
|
d1681e |
Date: Mon, 16 Apr 2018 17:44:19 +0530
|
|
|
d1681e |
Subject: [PATCH 223/236] glusterd: Make localtime-logging option invisible in
|
|
|
d1681e |
downstream
|
|
|
d1681e |
|
|
|
d1681e |
Label: DOWNSTREAM ONLY
|
|
|
d1681e |
|
|
|
d1681e |
Change-Id: Ie631edebb7e19152392bfd3c369a96e88796bd75
|
|
|
d1681e |
BUG: 1567110
|
|
|
d1681e |
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
d1681e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/135754
|
|
|
d1681e |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
d1681e |
---
|
|
|
d1681e |
xlators/mgmt/glusterd/src/glusterd-op-sm.c | 2 +-
|
|
|
d1681e |
xlators/mgmt/glusterd/src/glusterd-volume-set.c | 4 ++--
|
|
|
d1681e |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
d1681e |
|
|
|
d1681e |
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
|
|
|
d1681e |
index 72d349b..d479ed4 100644
|
|
|
d1681e |
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
|
|
|
d1681e |
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
|
|
|
d1681e |
@@ -85,7 +85,7 @@ glusterd_all_vol_opts valid_all_vol_opts[] = {
|
|
|
d1681e |
* TBD: Discuss the default value for this. Maybe this should be a
|
|
|
d1681e |
* dynamic value depending on the memory specifications per node */
|
|
|
d1681e |
{ GLUSTERD_BRICKMUX_LIMIT_KEY, "0"},
|
|
|
d1681e |
- { GLUSTERD_LOCALTIME_LOGGING_KEY, "disable"},
|
|
|
d1681e |
+ /*{ GLUSTERD_LOCALTIME_LOGGING_KEY, "disable"},*/
|
|
|
d1681e |
{ NULL },
|
|
|
d1681e |
};
|
|
|
d1681e |
|
|
|
d1681e |
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
|
|
|
d1681e |
index 4d41c6e..9bc0933 100644
|
|
|
d1681e |
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
|
|
|
d1681e |
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
|
|
|
d1681e |
@@ -3567,12 +3567,12 @@ struct volopt_map_entry glusterd_volopt_map[] = {
|
|
|
d1681e |
.op_version = GD_OP_VERSION_3_11_0,
|
|
|
d1681e |
.flags = OPT_FLAG_CLIENT_OPT
|
|
|
d1681e |
},
|
|
|
d1681e |
- { .key = GLUSTERD_LOCALTIME_LOGGING_KEY,
|
|
|
d1681e |
+ /*{ .key = GLUSTERD_LOCALTIME_LOGGING_KEY,
|
|
|
d1681e |
.voltype = "mgmt/glusterd",
|
|
|
d1681e |
.type = GLOBAL_DOC,
|
|
|
d1681e |
.op_version = GD_OP_VERSION_3_12_0,
|
|
|
d1681e |
.validate_fn = validate_boolean
|
|
|
d1681e |
- },
|
|
|
d1681e |
+ },*/
|
|
|
d1681e |
{ .key = "disperse.parallel-writes",
|
|
|
d1681e |
.voltype = "cluster/disperse",
|
|
|
d1681e |
.type = NO_DOC,
|
|
|
d1681e |
--
|
|
|
d1681e |
1.8.3.1
|
|
|
d1681e |
|