|
 |
3604df |
From 37361d3f32e7cabf8bb610fa37be37591e30eea2 Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
3604df |
Date: Tue, 20 Dec 2016 10:42:31 +0530
|
|
|
3604df |
Subject: [PATCH 253/257] ganesha/scripts : Prevent removal of entries in
|
|
|
3604df |
ganesha.conf during deletion of a node
|
|
|
3604df |
|
|
|
3604df |
Upstream reference :
|
|
|
3604df |
>Change-Id: Ia6c653eeb9bef7ff4107757f845218c2316db2e4
|
|
|
3604df |
>BUG: 1406249
|
|
|
3604df |
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
3604df |
>Reviewed-on: http://review.gluster.org/16209
|
|
|
3604df |
>Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>Reviewed-by: soumya k <skoduri@redhat.com>
|
|
|
3604df |
>(cherry picked from commit 8b42e1b5688f8600086ecc0e33ac4abf5e7c2772)
|
|
|
3604df |
|
|
|
3604df |
Change-Id: Ia6c653eeb9bef7ff4107757f845218c2316db2e4
|
|
|
3604df |
BUG: 1406025
|
|
|
3604df |
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/93568
|
|
|
3604df |
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
3604df |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
extras/ganesha/scripts/ganesha-ha.sh | 2 +-
|
|
|
3604df |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
3604df |
index 99b71e7..2a653c9 100644
|
|
|
3604df |
--- a/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
3604df |
+++ b/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
3604df |
@@ -970,8 +970,8 @@ create_ganesha_conf_file()
|
|
|
3604df |
else
|
|
|
3604df |
# Restoring previous file
|
|
|
3604df |
rm -rf $GANESHA_CONF
|
|
|
3604df |
- sed -r -i -e '/^%include[[:space:]]+".+\.conf"$/d' $HA_CONFDIR/ganesha.conf
|
|
|
3604df |
cp $HA_CONFDIR/ganesha.conf $GANESHA_CONF
|
|
|
3604df |
+ sed -r -i -e '/^%include[[:space:]]+".+\.conf"$/d' $GANESHA_CONF
|
|
|
3604df |
fi
|
|
|
3604df |
}
|
|
|
3604df |
|
|
|
3604df |
--
|
|
|
3604df |
2.9.3
|
|
|
3604df |
|