Attachment 13827 Details for Bug 12934 – git-am fix for 4.7.next and 4.6.next

[patch] git-am fix for 4.7.next and 4.6.next

zfsacl-manpage-fixes-47.patch (text/plain), 2.33 KB, created by Uri Simchoni on 2017-11-30 05:47:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Uri Simchoni

Created: 2017-11-30 05:47:26 UTC

Size: 2.33 KB

patch

obsolete

>From ebeec9d370792d0795f14959f63b75b2572b2839 Mon Sep 17 00:00:00 2001
>From: "Timur I. Bakeyev" <timur@iXsystems.com>
>Date: Wed, 29 Nov 2017 05:48:52 +0100
>Subject: [PATCH 1/2] Fix typo in the "wide links" description for the getwd
> cache.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12934
>
>Signed-off-by: Timur I. Bakeyev <timur@iXsystems.com>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Uri Simchoni <uri@samba.org>
>(cherry picked from commit e9e4cd4d2b6ae376cba90fdb56b9c9684f2dc492)
>---
> docs-xml/smbdotconf/tuning/getwdcache.xml | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/docs-xml/smbdotconf/tuning/getwdcache.xml b/docs-xml/smbdotconf/tuning/getwdcache.xml
>index 93f7a90..ec4d9ed 100644
>--- a/docs-xml/smbdotconf/tuning/getwdcache.xml
>+++ b/docs-xml/smbdotconf/tuning/getwdcache.xml
>@@ -6,7 +6,7 @@
>     <para>This is a tuning option. When this is enabled a 
>     caching algorithm will be used to reduce the time taken for getwd() 
>     calls. This can have a significant impact on performance, especially 
>-    when the <smbconfoption name="wide smbconfoptions"/> parameter is set to <constant>no</constant>.</para>
>+    when the <smbconfoption name="wide links"/> parameter is set to <constant>no</constant>.</para>
> </description>
> 
> <value type="default">yes</value>
>-- 
>2.9.5
>
>
>From 3d8ef41d18ffad2d171d753643516a080fef9c5b Mon Sep 17 00:00:00 2001
>From: "Timur I. Bakeyev" <timur@iXsystems.com>
>Date: Wed, 29 Nov 2017 06:35:37 +0100
>Subject: [PATCH 2/2] Add vfs_zfsacl manpage to the list of manpages if we have
> this module enabled.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12934
>
>Signed-off-by: Timur I. Bakeyev <timur@iXsystems.com>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Uri Simchoni <uri@samba.org>
>(cherry picked from commit 8034b88d4e771663c4b7b581fb6b1992c33d5d96)
>---
> docs-xml/wscript_build | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
>index eb25aa0..3ff1ade 100644
>--- a/docs-xml/wscript_build
>+++ b/docs-xml/wscript_build
>@@ -158,3 +158,6 @@ if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
> 
>     if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
>         bld.SAMBAMANPAGES(krb5_locator_manpages)
>+
>+    if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
>+        bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
>-- 
>2.9.5
>

Flags:

vl: review+

Actions: View

Attachments on bug 12934: 13818 | 13827