[Pkg-samba-maint] r3715 - in trunk/ctdb/debian: . patches
sathieu at alioth.debian.org
sathieu at alioth.debian.org
Wed Mar 23 21:41:12 UTC 2011
Author: sathieu
Date: 2011-03-23 21:41:11 +0000 (Wed, 23 Mar 2011)
New Revision: 3715
Added:
trunk/ctdb/debian/patches/62-spelling-errors.diff
Modified:
trunk/ctdb/debian/changelog
trunk/ctdb/debian/patches/series
Log:
added 62-spelling-errors.diff
Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog 2011-03-22 20:43:10 UTC (rev 3714)
+++ trunk/ctdb/debian/changelog 2011-03-23 21:41:11 UTC (rev 3715)
@@ -7,11 +7,12 @@
- removed 61-spelling-errors-manpages.diff, merged upstream
- removed 70-nfstickle-sysconfig.diff, fixed upstream
- removed 71-correct-nice_service.diff, merged upstream
+ - added 62-spelling-errors.diff
* debian/watch, debian/uupdate-wrapper: use new upstream git url
* Switch to dpkg-source 3.0 (quilt) format
* Bump Standards-Version to 3.9.1: no changes
- -- Mathieu Parent <sathieu at debian.org> Tue, 22 Mar 2011 21:06:12 +0100
+ -- Mathieu Parent <sathieu at debian.org> Wed, 23 Mar 2011 22:40:09 +0100
ctdb (1.0.112-12-1) unstable; urgency=low
Added: trunk/ctdb/debian/patches/62-spelling-errors.diff
===================================================================
--- trunk/ctdb/debian/patches/62-spelling-errors.diff (rev 0)
+++ trunk/ctdb/debian/patches/62-spelling-errors.diff 2011-03-23 21:41:11 UTC (rev 3715)
@@ -0,0 +1,172 @@
+Goal: Correction of spelling errors
+
+* continous -> continuous
+* activete -> activate
+
+(thanks to lintian)
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: https://bugzilla.samba.org/show_bug.cgi?id=6935
+
+diff --git a/config/events.d/README b/config/events.d/README
+index c05a1fd..024af24 100644
+--- a/config/events.d/README
++++ b/config/events.d/README
+@@ -71,7 +71,7 @@ monitor
+ The interval can be configured using the MonitorInterval tunable
+ but defaults to 15 seconds.
+
+- This event is triggered by ctdb to continously monitor that all
++ This event is triggered by ctdb to continuously monitor that all
+ managed services are healthy.
+ When invoked, the event script will check that the service is healthy
+ and return 0 if so. If the service is not healthy the event script
+diff --git a/doc/ctdb.1 b/doc/ctdb.1
+index 2fce654..5cce2fb 100644
+--- a/doc/ctdb.1
++++ b/doc/ctdb.1
+@@ -786,7 +786,7 @@ This command can be used to remove all content of a database\&.
+ .PP
+ In addition to the normal loggign to a log file, CTDBD also keeps a in\-memory ringbuffer containing the most recent log entries for all log levels (except DEBUG)\&.
+ .PP
+-This is useful since it allows for keeping continous logs to a file at a reasonable non\-verbose level, but shortly after an incident has occured, a much more detailed log can be pulled from memory\&. This can allow you to avoid having to reproduce an issue due to the on\-disk logs being of insufficient detail\&.
++This is useful since it allows for keeping continuous logs to a file at a reasonable non\-verbose level, but shortly after an incident has occured, a much more detailed log can be pulled from memory\&. This can allow you to avoid having to reproduce an issue due to the on\-disk logs being of insufficient detail\&.
+ .PP
+ This command extracts all messages of level or lower log level from memory and prints it to the screen\&.
+ .SS "clearlog"
+@@ -909,7 +909,7 @@ This command will dump a clustered TDB database to the screen\&. This is a debug
+ This command will dump the content of database backup to the screen (similar to ctdb catdb)\&. This is a debugging command\&.
+ .SS "getmonmode"
+ .PP
+-This command returns the monutoring mode of a node\&. The monitoring mode is either ACTIVE or DISABLED\&. Normally a node will continously monitor that all other nodes that are expected are in fact connected and that they respond to commands\&.
++This command returns the monutoring mode of a node\&. The monitoring mode is either ACTIVE or DISABLED\&. Normally a node will continuously monitor that all other nodes that are expected are in fact connected and that they respond to commands\&.
+ .PP
+ ACTIVE \- This is the normal mode\&. The node is actively monitoring all other nodes, both that the transport is connected and also that the node responds to commands\&. If a node becomes unavailable, it will be marked as DISCONNECTED and a recovery is initiated to restore the cluster\&.
+ .PP
+diff --git a/doc/ctdb.1.html b/doc/ctdb.1.html
+index 5c5078b..169f2ce 100644
+--- a/doc/ctdb.1.html
++++ b/doc/ctdb.1.html
+@@ -595,7 +595,7 @@ This is mainly useful for backing up persistent databases such as secrets.tdb an
+ CTDBD also keeps a in-memory ringbuffer containing the most recent
+ log entries for all log levels (except DEBUG).
+ </p><p>
+- This is useful since it allows for keeping continous logs to a file
++ This is useful since it allows for keeping continuous logs to a file
+ at a reasonable non-verbose level, but shortly after an incident has
+ occured, a much more detailed log can be pulled from memory. This
+ can allow you to avoid having to reproduce an issue due to the
+@@ -678,7 +678,7 @@ HEALTH: NO-HEALTHY-NODES - ERROR - Backup of corrupted TDB in '/var/ctdb/persist
+ This command will dump the content of database backup to the screen
+ (similar to ctdb catdb). This is a debugging command.
+ </p></div><div class="refsect2" title="getmonmode"><a name="id541247"></a><h3>getmonmode</h3><p>
+- This command returns the monutoring mode of a node. The monitoring mode is either ACTIVE or DISABLED. Normally a node will continously monitor that all other nodes that are expected are in fact connected and that they respond to commands.
++ This command returns the monutoring mode of a node. The monitoring mode is either ACTIVE or DISABLED. Normally a node will continuously monitor that all other nodes that are expected are in fact connected and that they respond to commands.
+ </p><p>
+ ACTIVE - This is the normal mode. The node is actively monitoring all other nodes, both that the transport is connected and also that the node responds to commands. If a node becomes unavailable, it will be marked as DISCONNECTED and a recovery is initiated to restore the cluster.
+ </p><p>
+diff --git a/doc/ctdb.1.xml b/doc/ctdb.1.xml
+index 7924354..78da195 100644
+--- a/doc/ctdb.1.xml
++++ b/doc/ctdb.1.xml
+@@ -1050,7 +1050,7 @@ This is mainly useful for backing up persistent databases such as secrets.tdb an
+ CTDBD also keeps a in-memory ringbuffer containing the most recent
+ log entries for all log levels (except DEBUG).
+ </para><para>
+- This is useful since it allows for keeping continous logs to a file
++ This is useful since it allows for keeping continuous logs to a file
+ at a reasonable non-verbose level, but shortly after an incident has
+ occured, a much more detailed log can be pulled from memory. This
+ can allow you to avoid having to reproduce an issue due to the
+@@ -1181,7 +1181,7 @@ HEALTH: NO-HEALTHY-NODES - ERROR - Backup of corrupted TDB in '/var/ctdb/persist
+
+ <refsect2><title>getmonmode</title>
+ <para>
+- This command returns the monutoring mode of a node. The monitoring mode is either ACTIVE or DISABLED. Normally a node will continously monitor that all other nodes that are expected are in fact connected and that they respond to commands.
++ This command returns the monutoring mode of a node. The monitoring mode is either ACTIVE or DISABLED. Normally a node will continuously monitor that all other nodes that are expected are in fact connected and that they respond to commands.
+ </para>
+ <para>
+ ACTIVE - This is the normal mode. The node is actively monitoring all other nodes, both that the transport is connected and also that the node responds to commands. If a node becomes unavailable, it will be marked as DISCONNECTED and a recovery is initiated to restore the cluster.
+diff --git a/doc/ctdbd.1 b/doc/ctdbd.1
+index 5800520..9d0b129 100644
+--- a/doc/ctdbd.1
++++ b/doc/ctdbd.1
+@@ -191,7 +191,7 @@ Send all log messages to syslog instead of to the ctdb logfile\&.
+ .RS 4
+ In addition to the normal loggign to a log file, CTDBD also keeps a in\-memory ringbuffer containing the most recent log entries for all log levels (except DEBUG)\&.
+ .sp
+-This is useful since it allows for keeping continous logs to a file at a reasonable non\-verbose level, but shortly after an incident has occured, a much more detailed log can be pulled from memory\&. This can allow you to avoid having to reproduce an issue due to the on\-disk logs being of insufficient detail\&.
++This is useful since it allows for keeping continuous logs to a file at a reasonable non\-verbose level, but shortly after an incident has occured, a much more detailed log can be pulled from memory\&. This can allow you to avoid having to reproduce an issue due to the on\-disk logs being of insufficient detail\&.
+ .sp
+ This in\-memory ringbuffer contains a fixed number of the most recent entries\&. This is settable at startup either through the \-\-log\-ringbuf\-size argument, or preferably by using CTDB_LOG_RINGBUF_SIZE in the sysconfig file\&.
+ .sp
+@@ -426,7 +426,7 @@ Note: you can use LVS and public addresses at the same time\&.
+ .PP
+ To activate LVS on a CTDB node you must specify CTDB_PUBLIC_INTERFACE and CTDB_LVS_PUBLIC_ADDRESS in /etc/sysconfig/ctdb\&.
+ .PP
+-You must also specify the "\-\-lvs" command line argument to ctdbd to activete LVS as a capability of the node\&. This should be done automatically for you by the /etc/init\&.d/ctdb script\&.
++You must also specify the "\-\-lvs" command line argument to ctdbd to activate LVS as a capability of the node\&. This should be done automatically for you by the /etc/init\&.d/ctdb script\&.
+ .PP
+ Example:
+ .sp
+diff --git a/doc/ctdbd.1.html b/doc/ctdbd.1.html
+index 063fbce..acffd47 100644
+--- a/doc/ctdbd.1.html
++++ b/doc/ctdbd.1.html
+@@ -131,7 +131,7 @@
+ CTDBD also keeps a in-memory ringbuffer containing the most recent
+ log entries for all log levels (except DEBUG).
+ </p><p>
+- This is useful since it allows for keeping continous logs to a file
++ This is useful since it allows for keeping continuous logs to a file
+ at a reasonable non-verbose level, but shortly after an incident has
+ occured, a much more detailed log can be pulled from memory. This
+ can allow you to avoid having to reproduce an issue due to the
+@@ -373,7 +373,7 @@ ctdb will try to reassign public IP addresses onto the new node as a way to dist
+ To activate LVS on a CTDB node you must specify CTDB_PUBLIC_INTERFACE and
+ CTDB_LVS_PUBLIC_ADDRESS in /etc/sysconfig/ctdb.
+ </p><p>
+-You must also specify the "--lvs" command line argument to ctdbd to activete LVS as a capability of the node. This should be done automatically for you by the /etc/init.d/ctdb script.
++You must also specify the "--lvs" command line argument to ctdbd to activate LVS as a capability of the node. This should be done automatically for you by the /etc/init.d/ctdb script.
+ </p><p>
+ Example:
+ </p><pre class="screen">
+diff --git a/doc/ctdbd.1.xml b/doc/ctdbd.1.xml
+index 91e2f9f..f8f9d7f 100644
+--- a/doc/ctdbd.1.xml
++++ b/doc/ctdbd.1.xml
+@@ -349,7 +349,7 @@
+ log entries for all log levels (except DEBUG).
+ </para>
+ <para>
+- This is useful since it allows for keeping continous logs to a file
++ This is useful since it allows for keeping continuous logs to a file
+ at a reasonable non-verbose level, but shortly after an incident has
+ occured, a much more detailed log can be pulled from memory. This
+ can allow you to avoid having to reproduce an issue due to the
+@@ -737,7 +737,7 @@ ctdb will try to reassign public IP addresses onto the new node as a way to dist
+ </para>
+
+ <para>
+-You must also specify the "--lvs" command line argument to ctdbd to activete LVS as a capability of the node. This should be done automatically for you by the /etc/init.d/ctdb script.
++You must also specify the "--lvs" command line argument to ctdbd to activate LVS as a capability of the node. This should be done automatically for you by the /etc/init.d/ctdb script.
+ </para>
+
+ <para>
+diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c
+index bdb7c40..50ff45a 100644
+--- a/server/ctdb_vacuum.c
++++ b/server/ctdb_vacuum.c
+@@ -874,7 +874,7 @@ static int update_tuning_db(struct ctdb_db_context *ctdb_db, struct vacuum_data
+
+ /*
+ * re-calc new vacuum interval:
+- * in case no limit was reached we continously increase the interval
++ * in case no limit was reached we continuously increase the interval
+ * until vacuum_max_interval is reached
+ * in case a limit was reached we divide the current interval by 2
+ * unless vacuum_min_interval is reached
+--
+1.7.4.1
+
Modified: trunk/ctdb/debian/patches/series
===================================================================
--- trunk/ctdb/debian/patches/series 2011-03-22 20:43:10 UTC (rev 3714)
+++ trunk/ctdb/debian/patches/series 2011-03-23 21:41:11 UTC (rev 3715)
@@ -1,3 +1,4 @@
02_ctdb_diagnostics.diff
05-hurd.diff
10_no-lib64.diff
+62-spelling-errors.diff
More information about the Pkg-samba-maint
mailing list