From 2b7ae34eff4ed00f15661cf1ca5b2ee07a1d93bd 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: 1325630 Signed-off-by: Vijay Bellur Reviewed-on: http://review.gluster.org/13929 Reviewed-by: Pranith Kumar Karampuri Reviewed-on: http://review.gluster.org/13958 Smoke: Gluster Build System Tested-by: Kaushal M CentOS-regression: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Kaushal M --- 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 03c9f444361..9be67de8a07 100644 --- a/tests/include.rc +++ b/tests/include.rc @@ -455,9 +455,10 @@ function cleanup() ;; esac - # remove contents of "GLUSTERD_WORKDIR" except hooks directory. + # remove contents of "GLUSTERD_WORKDIR" except hooks and groups + # directories. find $GLUSTERD_WORKDIR/* -maxdepth 0 -name 'hooks' -prune \ - -o -exec rm -rf '{}' ';' + -o -name 'groups' -prune -o -exec rm -rf '{}' ';' rm -rf $B0/* /etc/glusterd/*; -- cgit