diff options
| author | Mohammed Junaid <junaid@redhat.com> | 2012-04-16 12:57:57 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-04-16 11:35:49 -0700 |
| commit | 754112b7b716c68fb6cf44941ce4f343698d533e (patch) | |
| tree | 4b6b3715b766a5fb56fde8683ead841b34458598 /xlators/mgmt/glusterd/src | |
| parent | 42c06ba048d0bcb7093063bf99dfa3e520a038a5 (diff) | |
protocol/client,server: Lock self healing off by default.
Also, merged the options client.grace-timeout and server.grace-timeout
into one option "features.grace-timeout".
Change-Id: Icb9f0809f89379de673f8c9f7ca4725bc113797f
BUG: 812760
Signed-off-by: Mohammed Junaid <junaid@redhat.com>
Reviewed-on: http://review.gluster.com/3153
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 9b8daa16a65..3cf5b5f1331 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -217,8 +217,8 @@ static struct volopt_map_entry glusterd_volopt_map[] = { {"server.statedump-path", "protocol/server", "statedump-path", NULL, DOC, 0}, {"features.lock-heal", "protocol/client", "lk-heal", NULL, DOC, 0}, {"features.lock-heal", "protocol/server", "lk-heal", NULL, DOC, 0}, - {"client.grace-timeout", "protocol/client", "grace-timeout", NULL, DOC, 0}, - {"server.grace-timeout", "protocol/server", "grace-timeout", NULL, DOC, 0}, + {"features.grace-timeout", "protocol/client", "grace-timeout", NULL, DOC, 0}, + {"features.grace-timeout", "protocol/server", "grace-timeout", NULL, DOC, 0}, {"feature.read-only", "features/read-only", "!read-only", "off", DOC, 0}, {NULL, } }; |