[Pkg-samba-maint] r3846 - in trunk/ctdb/debian: . patches
sathieu at alioth.debian.org
sathieu at alioth.debian.org
Mon Jul 25 22:06:35 UTC 2011
Author: sathieu
Date: 2011-07-25 22:06:34 +0000 (Mon, 25 Jul 2011)
New Revision: 3846
Removed:
trunk/ctdb/debian/patches/50-fix-bashism.diff
trunk/ctdb/debian/patches/70-ping_pong-manpage.diff
Modified:
trunk/ctdb/debian/changelog
trunk/ctdb/debian/patches/series
Log:
New upstream snapshot
- removed 50-fix-bashism.diff, merged upstream
- removed 70-ping_pong-manpage.diff, merged upstream
Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog 2011-07-25 21:22:10 UTC (rev 3845)
+++ trunk/ctdb/debian/changelog 2011-07-25 22:06:34 UTC (rev 3846)
@@ -1,3 +1,11 @@
+ctdb (1.10+git20110722-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot
+ - removed 50-fix-bashism.diff, merged upstream
+ - removed 70-ping_pong-manpage.diff, merged upstream
+
+ -- Mathieu Parent <sathieu at debian.org> Mon, 25 Jul 2011 23:56:22 +0200
+
ctdb (1.10+git20110412-2) unstable; urgency=low
* Upload to unstable
Deleted: trunk/ctdb/debian/patches/50-fix-bashism.diff
===================================================================
--- trunk/ctdb/debian/patches/50-fix-bashism.diff 2011-07-25 21:22:10 UTC (rev 3845)
+++ trunk/ctdb/debian/patches/50-fix-bashism.diff 2011-07-25 22:06:34 UTC (rev 3846)
@@ -1,22 +0,0 @@
-Goal: Fix bashism
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: https://bugzilla.samba.org/show_bug.cgi?id=6407
-
-diff --git a/config/events.d/60.ganesha b/config/events.d/60.ganesha
-index b7bc923..6559dd0 100644
---- a/config/events.d/60.ganesha
-+++ b/config/events.d/60.ganesha
-@@ -13,7 +13,7 @@ start_nfs() {
-
- loadconfig nfs
-
--[ "$NFS_SERVER_MODE" == "GANESHA" ] || exit 0
-+[ "$NFS_SERVER_MODE" = "GANESHA" ] || exit 0
-
- service_name="nfs-ganesha-gpfs"
-
---
-1.7.4.1
-
Deleted: trunk/ctdb/debian/patches/70-ping_pong-manpage.diff
===================================================================
--- trunk/ctdb/debian/patches/70-ping_pong-manpage.diff 2011-07-25 21:22:10 UTC (rev 3845)
+++ trunk/ctdb/debian/patches/70-ping_pong-manpage.diff 2011-07-25 22:06:34 UTC (rev 3846)
@@ -1,334 +0,0 @@
-Goal: manpage for ping_pong
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: https://bugzilla.samba.org/show_bug.cgi?id=8041
-
-From b6545340145a467dd20666c9dfa18b83b7978cfa Mon Sep 17 00:00:00 2001
-From: Mathieu Parent <math.parent at gmail.com>
-Date: Sat, 26 Mar 2011 11:55:30 +0100
-Subject: [PATCH] Manpage for ping_pong
-
----
- Makefile.in | 4 +-
- doc/ping_pong.1 | 110 ++++++++++++++++++++++++++++++++++++++++++++
- doc/ping_pong.1.html | 37 +++++++++++++++
- doc/ping_pong.1.xml | 110 ++++++++++++++++++++++++++++++++++++++++++++
- packaging/RPM/ctdb.spec.in | 1 +
- 5 files changed, 261 insertions(+), 1 deletions(-)
- create mode 100644 doc/ping_pong.1
- create mode 100644 doc/ping_pong.1.html
- create mode 100644 doc/ping_pong.1.xml
-
-diff --git a/Makefile.in b/Makefile.in
-index 6bbf616..ea25145 100755
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -198,7 +198,8 @@ tests/bin/ibwrapper_test: $(CTDB_CLIENT_OBJ) ib/ibwrapper_test.o
-
- doc: doc/ctdb.1 doc/ctdb.1.html \
- doc/ctdbd.1 doc/ctdbd.1.html \
-- doc/onnode.1 doc/onnode.1.html
-+ doc/onnode.1 doc/onnode.1.html \
-+ doc/ping_pong.1 doc/ping_pong.1.html
-
- clean:
- rm -f *.o */*.o */*.a */*/*.o */*~
-@@ -257,6 +258,7 @@ install: all
- if [ -f doc/ctdb.1 ];then ${INSTALLCMD} -m 644 doc/ctdb.1 $(DESTDIR)$(mandir)/man1; fi
- if [ -f doc/ctdbd.1 ];then ${INSTALLCMD} -m 644 doc/ctdbd.1 $(DESTDIR)$(mandir)/man1; fi
- if [ -f doc/onnode.1 ];then ${INSTALLCMD} -m 644 doc/onnode.1 $(DESTDIR)$(mandir)/man1; fi
-+ if [ -f doc/ping_pong.1 ];then ${INSTALLCMD} -m 644 doc/ping_pong.1 $(DESTDIR)$(mandir)/man1; fi
- if [ ! -f $(DESTDIR)$(etcdir)/ctdb/notify.sh ];then ${INSTALLCMD} -m 755 config/notify.sh $(DESTDIR)$(etcdir)/ctdb; fi
- if [ ! -f $(DESTDIR)$(etcdir)/ctdb/ctdb-crash-cleanup.sh ];then ${INSTALLCMD} -m 755 config/ctdb-crash-cleanup.sh $(DESTDIR)$(etcdir)/ctdb; fi
-
-diff --git a/doc/ping_pong.1 b/doc/ping_pong.1
-new file mode 100644
-index 0000000..3448faa
---- /dev/null
-+++ b/doc/ping_pong.1
-@@ -0,0 +1,110 @@
-+'\" t
-+.\" Title: ping_pong
-+.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-+.\" Date: 03/26/2011
-+.\" Manual:
-+.\" Source:
-+.\" Language: English
-+.\"
-+.TH "PING_PONG" "1" "03/26/2011" "" ""
-+.\" -----------------------------------------------------------------
-+.\" * Define some portability stuff
-+.\" -----------------------------------------------------------------
-+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+.\" http://bugs.debian.org/507673
-+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+.ie \n(.g .ds Aq \(aq
-+.el .ds Aq '
-+.\" -----------------------------------------------------------------
-+.\" * set default formatting
-+.\" -----------------------------------------------------------------
-+.\" disable hyphenation
-+.nh
-+.\" disable justification (adjust text to left margin only)
-+.ad l
-+.\" -----------------------------------------------------------------
-+.\" * MAIN CONTENT STARTS HERE *
-+.\" -----------------------------------------------------------------
-+.SH "NAME"
-+ping_pong \- measures the ping\-pong byte range lock latency
-+.SH "SYNOPSIS"
-+.HP \w'\fBping_pong\ [options]\ <file>\ <num_locks>\fR\ 'u
-+\fBping_pong [options] <file> <num_locks>\fR
-+.HP \w'\fBping_pong\fR\ 'u
-+\fBping_pong\fR [\-r] [\-w] [\-m]
-+.SH "DESCRIPTION"
-+.PP
-+This measures the ping\-pong byte range lock latency\&. It is especially useful on a cluster of nodes sharing a common lock manager as it will give some indication of the lock managers performance under stress\&.
-+.SH "OPTIONS"
-+.PP
-+\-r
-+.RS 4
-+do reads
-+.RE
-+.PP
-+\-w
-+.RS 4
-+do writes
-+.RE
-+.PP
-+\-m
-+.RS 4
-+use mmap
-+.RE
-+.SH "EXAMPLES"
-+.PP
-+Testing lock coherence
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+ ping_pong test\&.dat N
-+
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.PP
-+Testing IO coherence
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+ ping_pong \-rw test\&.dat N
-+
-+.fi
-+.if n \{\
-+.RE
-+.\}
-+.SH "SEE ALSO"
-+.PP
-+
-+\m[blue]\fB\%https://wiki.samba.org/index.php/Ping_pong\fR\m[], ctdb(1), ctdbd(1)
-+.SH "COPYRIGHT/LICENSE"
-+.sp
-+.if n \{\
-+.RS 4
-+.\}
-+.nf
-+Copyright (C) Andrew Tridgell 2002
-+
-+This program is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 3 of the License, or (at
-+your option) any later version\&.
-+
-+This program is distributed in the hope that it will be useful, but
-+WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\&. See the GNU
-+General Public License for more details\&.
-+
-+You should have received a copy of the GNU General Public License
-+along with this program; if not, see http://www\&.gnu\&.org/licenses/\&.
-+.fi
-+.if n \{\
-+.RE
-+.\}
-diff --git a/doc/ping_pong.1.html b/doc/ping_pong.1.html
-new file mode 100644
-index 0000000..e7e6973
---- /dev/null
-+++ b/doc/ping_pong.1.html
-@@ -0,0 +1,37 @@
-+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>ping_pong</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" title="ping_pong"><a name="ping_pong.1"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>ping_pong — measures the ping-pong byte range lock latency</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">ping_pong [options] <file> <num_locks></code> </p></div><div class="cmdsynopsis"><p><code class="command">ping_pong</code> [-r] [-w] [-m]</p></div></div><div class="refsect1" title="DESCRIPTION"><a name="id2949769"></a><h2>DESCRIPTION</h2><p>
-+ This measures the ping-pong byte range lock latency. It is
-+ especially useful on a cluster of nodes sharing a common lock
-+ manager as it will give some indication of the lock managers
-+ performance under stress.
-+ </p></div><div class="refsect1" title="OPTIONS"><a name="id2949782"></a><h2>OPTIONS</h2><div class="variablelist"><dl><dt><span class="term">-r</span></dt><dd><p>
-+ do reads
-+ </p></dd><dt><span class="term">-w</span></dt><dd><p>
-+ do writes
-+ </p></dd><dt><span class="term">-m</span></dt><dd><p>
-+ use mmap
-+ </p></dd></dl></div></div><div class="refsect1" title="EXAMPLES"><a name="id2949828"></a><h2>EXAMPLES</h2><p>
-+ Testing lock coherence
-+ </p><pre class="screen">
-+ ping_pong test.dat N
-+ </pre><p>
-+ Testing IO coherence
-+ </p><pre class="screen">
-+ ping_pong -rw test.dat N
-+ </pre></div><div class="refsect1" title="SEE ALSO"><a name="id2949852"></a><h2>SEE ALSO</h2><p>
-+ <a class="ulink" href="https://wiki.samba.org/index.php/Ping_pong" target="_top">https://wiki.samba.org/index.php/Ping_pong</a>, ctdb(1), ctdbd(1)
-+ </p></div><div class="refsect1" title="COPYRIGHT/LICENSE"><a name="id2949866"></a><h2>COPYRIGHT/LICENSE</h2><div class="literallayout"><p><br>
-+Copyright (C) Andrew Tridgell 2002<br>
-+<br>
-+This program is free software; you can redistribute it and/or modify<br>
-+it under the terms of the GNU General Public License as published by<br>
-+the Free Software Foundation; either version 3 of the License, or (at<br>
-+your option) any later version.<br>
-+<br>
-+This program is distributed in the hope that it will be useful, but<br>
-+WITHOUT ANY WARRANTY; without even the implied warranty of<br>
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU<br>
-+General Public License for more details.<br>
-+<br>
-+You should have received a copy of the GNU General Public License<br>
-+along with this program; if not, see http://www.gnu.org/licenses/.<br>
-+</p></div></div></div></body></html>
-diff --git a/doc/ping_pong.1.xml b/doc/ping_pong.1.xml
-new file mode 100644
-index 0000000..0b67e8f
---- /dev/null
-+++ b/doc/ping_pong.1.xml
-@@ -0,0 +1,110 @@
-+<?xml version="1.0" encoding="iso-8859-1"?>
-+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-+<refentry id="ping_pong.1">
-+
-+<refmeta>
-+ <refentrytitle>ping_pong</refentrytitle>
-+ <manvolnum>1</manvolnum>
-+ <refmiscinfo class="source"> </refmiscinfo>
-+ <refmiscinfo class="manual"> </refmiscinfo>
-+</refmeta>
-+
-+
-+<refnamediv>
-+ <refname>ping_pong</refname>
-+ <refpurpose>measures the ping-pong byte range lock latency</refpurpose>
-+</refnamediv>
-+
-+<refsynopsisdiv>
-+ <cmdsynopsis>
-+ <command>ping_pong [options] <file> <num_locks></command>
-+ </cmdsynopsis>
-+
-+ <cmdsynopsis>
-+ <command>ping_pong</command>
-+ <arg choice="opt">-r</arg>
-+ <arg choice="opt">-w</arg>
-+ <arg choice="opt">-m</arg>
-+ </cmdsynopsis>
-+
-+</refsynopsisdiv>
-+
-+ <refsect1><title>DESCRIPTION</title>
-+ <para>
-+ This measures the ping-pong byte range lock latency. It is
-+ especially useful on a cluster of nodes sharing a common lock
-+ manager as it will give some indication of the lock managers
-+ performance under stress.
-+ </para>
-+
-+ </refsect1>
-+
-+ <refsect1><title>OPTIONS</title>
-+
-+ <variablelist>
-+ <varlistentry><term>-r</term>
-+ <listitem>
-+ <para>
-+ do reads
-+ </para>
-+ </listitem>
-+ </varlistentry>
-+
-+ <varlistentry><term>-w</term>
-+ <listitem>
-+ <para>
-+ do writes
-+ </para>
-+ </listitem>
-+ </varlistentry>
-+
-+ <varlistentry><term>-m</term>
-+ <listitem>
-+ <para>
-+ use mmap
-+ </para>
-+ </listitem>
-+ </varlistentry>
-+ </variablelist>
-+ </refsect1>
-+
-+ <refsect1><title>EXAMPLES</title>
-+ <para>
-+ Testing lock coherence
-+ </para>
-+ <screen format="linespecific">
-+ ping_pong test.dat N
-+ </screen>
-+
-+ <para>
-+ Testing IO coherence
-+ </para>
-+ <screen format="linespecific">
-+ ping_pong -rw test.dat N
-+ </screen>
-+ </refsect1>
-+
-+ <refsect1><title>SEE ALSO</title>
-+ <para>
-+ <ulink url="https://wiki.samba.org/index.php/Ping_pong"/>, ctdb(1), ctdbd(1)
-+ </para>
-+ </refsect1>
-+ <refsect1><title>COPYRIGHT/LICENSE</title>
-+<literallayout>
-+Copyright (C) Andrew Tridgell 2002
-+
-+This program is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 3 of the License, or (at
-+your option) any later version.
-+
-+This program is distributed in the hope that it will be useful, but
-+WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with this program; if not, see http://www.gnu.org/licenses/.
-+</literallayout>
-+ </refsect1>
-+</refentry>
-diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
-index 1f43825..6072296 100644
---- a/packaging/RPM/ctdb.spec.in
-+++ b/packaging/RPM/ctdb.spec.in
-@@ -122,6 +122,7 @@ rm -rf $RPM_BUILD_ROOT
- %{_mandir}/man1/ctdb.1.gz
- %{_mandir}/man1/ctdbd.1.gz
- %{_mandir}/man1/onnode.1.gz
-+%{_mandir}/man1/ping_pong.1.gz
- %{_libdir}/pkgconfig/ctdb.pc
-
- %{_docdir}/ctdb/tests/bin/ctdb_transaction
---
-1.7.4.1
-
Modified: trunk/ctdb/debian/patches/series
===================================================================
--- trunk/ctdb/debian/patches/series 2011-07-25 21:22:10 UTC (rev 3845)
+++ trunk/ctdb/debian/patches/series 2011-07-25 22:06:34 UTC (rev 3846)
@@ -1,6 +1,4 @@
02_ctdb_diagnostics.diff
05-hurd.diff
10_no-lib64.diff
-50-fix-bashism.diff
-70-ping_pong-manpage.diff
99-fix-broken-readdir-test.diff
More information about the Pkg-samba-maint
mailing list