From 09c9da3b12da73dd718522fdf7587d3be5a14137 Mon Sep 17 00:00:00 2001 From: Vijay Bellur Date: Fri, 8 Apr 2016 21:59:53 -0400 Subject: extras: Add namespace for options in group-virt.example Commit 23ccabbeb7 introduced a new key "disperse.eager-lock" which causes a conflict with key "cluster.eager-lock" when option is used without the qualifying namespace. group-virt.example which gets installed as /var/lib/glusterd/ groups/virt contains options without namespace qualifiers. This patch adds the appropriate namespace to all options in group-virt.example. Change-Id: I2c09dd10d44138410d889ddeb805f01c641c6780 BUG: 1314649 Signed-off-by: Vijay Bellur Reviewed-on: http://review.gluster.org/13929 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Pranith Kumar Karampuri --- tests/include.rc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/include.rc') diff --git a/tests/include.rc b/tests/include.rc index 6f224833bf9..2beb4e676af 100644 --- a/tests/include.rc +++ b/tests/include.rc @@ -512,11 +512,12 @@ function cleanup() ;; esac - # remove contents of "GLUSTERD_WORKDIR" except hooks directory. + # remove contents of "GLUSTERD_WORKDIR" except hooks and groups + # directories. if [ -n $GLUSTERD_WORKDIR ] then find $GLUSTERD_WORKDIR/* -maxdepth 0 -name 'hooks' -prune \ - -o -exec rm -rf '{}' ';' + -o -name 'groups' -prune -o -exec rm -rf '{}' ';' else echo "GLUSTERD_WORKDIR is not set" fi -- cgit