13178ca5fa
This synchronises sos in master to the current upstream sos-2.2 branch and includes all patches from RHEL6 not already present.
12 lines
637 B
Diff
12 lines
637 B
Diff
diff -up sos-2.2/sos/plugins/gluster.py.orig sos-2.2/sos/plugins/gluster.py
|
|
--- sos-2.2/sos/plugins/gluster.py.orig 2012-04-23 18:25:15.698646073 +0100
|
|
+++ sos-2.2/sos/plugins/gluster.py 2012-04-23 18:25:25.257646291 +0100
|
|
@@ -59,6 +59,7 @@ class gluster(sos.plugintools.PluginBase
|
|
self.addForbiddenPath("/etc/glusterd/geo-replication/secret.pem")
|
|
else:
|
|
self.addCopySpec("/var/lib/glusterd/")
|
|
+ self.addForbiddenPath("/var/lib/glusterd/geo-replication/secret.pem")
|
|
|
|
# glusterfs-server rpm scripts stash this on migration to 3.3.x
|
|
self.addCopySpec("/etc/glusterd.rpmsave")
|