[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Wed Sep 18 19:52:03 UTC 2019

The branch, master has been updated
       via  3263dd32fed Argument to control number of operations -o no longer valid
       via  8df123e7f7c pod2man is no longer needed
      from  d65b17c3f7f s3:client:Use DEVICE_URI, instead of argv[0],for Device URI


- Log -----------------------------------------------------------------
commit 3263dd32fedf9e6c104a0c03f035b585c568a8d1
Author: Sam Zaydel <szaydel at gmail.com>
Date:   Thu Feb 7 20:07:57 2019 +0000

    Argument to control number of operations -o no longer valid
    (This patch, only removing manpage text, submitted by gitlab.com user
    Sam Zaydel @szaydel in MR 243 but without a Signed-off-by, so I
    (Andrew Bartlett) am adding mine to say I'm happy to say this is a
    legitimate and deliberate contribtion.)
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Wed Sep 18 19:51:11 UTC 2019 on sn-devel-184

commit 8df123e7f7cb591f6673ccffefffc30b946f1a5b
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Wed Sep 18 03:15:47 2019 +0000

    pod2man is no longer needed
    Since e24e344d0da58013fd5fa404529fe1d25ef403bf.
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14131
    Signed-off-by: Mathieu Parent <math.parent at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>


Summary of changes:
 pidl/wscript                         | 1 -
 source4/torture/man/smbtorture.1.xml | 5 -----
 2 files changed, 6 deletions(-)

Changeset truncated at 500 lines:

diff --git a/pidl/wscript b/pidl/wscript
index 01b71bd8b27..d1b8278990a 100644
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -34,7 +34,6 @@ def configure(conf):
     # yapp is used for building the parser
     conf.find_program('yapp', var='YAPP')
-    conf.find_program('pod2man', var='POD2MAN')
 def build(bld):
diff --git a/source4/torture/man/smbtorture.1.xml b/source4/torture/man/smbtorture.1.xml
index 09e19ed2f1f..9d2f9c9c031 100644
--- a/source4/torture/man/smbtorture.1.xml
+++ b/source4/torture/man/smbtorture.1.xml
@@ -26,7 +26,6 @@
 		<arg choice="opt">-N numprocs</arg>
 		<arg choice="opt">-n netbios_name</arg>
 		<arg choice="opt">-W workgroup</arg>
-		<arg choice="opt">-o num_operations</arg>
 		<arg choice="opt">-e num files(entries)</arg>
 		<arg choice="opt">-O socket_options</arg>
 		<arg choice="opt">-m maximum_protocol</arg>
@@ -217,10 +216,6 @@
 			<listitem><para>Specify number of smbtorture processes to launch.</para></listitem>
-		<varlistentry><term>-o num_operations</term>
-			<listitem><para>Number of times some operations should be tried before assuming they're output is consistent (default:100).</para></listitem>
-		</varlistentry>
 		<varlistentry><term>-e num_files</term>
 			<listitem><para>Number of entries to use in certain tests (such as creating X files) (default: 1000).</para></listitem>

Samba Shared Repository

More information about the samba-cvs mailing list