[Debian-ha-commits] [cluster-glue] 70/73: Add patch for fixing spelling error

[Richard Winters]

This is an automated email from the git hooks/post-receive script.

devrik-guest pushed a commit to branch master
in repository cluster-glue.

commit 851a8b35bcc5cf42418aca1f8d47b1e61b6c5aaf
Author: Richard B Winters <rik at mmogp.com>
Date:   Fri Apr 17 09:06:10 2015 -0400

    Add patch for fixing spelling error
    
    Conflicts:
    	debian/patches/series
---
 debian/patches/fix-spelling-of-output.patch | 32 +++++++++++++++++++++++++++++
 debian/patches/series                       | 15 +++-----------
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/debian/patches/fix-spelling-of-output.patch b/debian/patches/fix-spelling-of-output.patch
new file mode 100644
index 0000000..4204570
--- /dev/null
+++ b/debian/patches/fix-spelling-of-output.patch
@@ -0,0 +1,32 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Fri, 17 Apr 2015 08:46:31 -0400
+Subject: Fix spelling of output and improve grammar
+
+The spelling of output as ouput within the source throws a lintian
+warning. This patch resolves that.
+
+The grammar was also a tad off, so it was improved.
+
+Change-Id: I5ad23a1fb89c5fdb39ba1f9bb13905ff36de82ad
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ lrm/lrmd/lrmd.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lrm/lrmd/lrmd.c b/lrm/lrmd/lrmd.c
+index 385096b..188a4c0 100644
+--- a/lrm/lrmd/lrmd.c
++++ b/lrm/lrmd/lrmd.c
+@@ -3362,9 +3362,9 @@ on_ra_proc_finished(ProcTrack* p, int status, int signo, int exitcode
+ 						, op->rapop);
+ 		} else {
+ 			lrmd_log(LOG_WARNING, "There is something wrong: the "
+-				"first line isn't read in. Maybe the heartbeat "
+-				"does not ouput string correctly for status "
+-				"operation. Or the code (myself) is wrong.");
++				"first line isn't read in. Maybe heartbeat does "
++				"not ouptut the string correctly for the status "
++				"operation, or perhaps the code is wrong.");
+ 		}
+ 	}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index b5f2cda..051ce53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,3 @@
-<<<<<<< HEAD
-libtoolize_check.patch
-=======
-<<<<<<< Upstream, based on debianhistory
-<<<<<<< Upstream, based on debianhistory
-=======
-libtoolize_check.patch
->>>>>>> 479d35b Imported Debian patch 1.0.12~rc1+hg2777-1.2
-=======
-libtoolize_check.patch
->>>>>>> 5854b27 Patches replaced
->>>>>>> b0fe04b... Patches replaced
+logd_lsb_functions.diff
+raexecupstart.patch
+fix-spelling-of-output.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/cluster-glue.git