[Debian-ha-commits] [resource-agents] 03/04: Remove patches applied upstream

[Valentin Vidic]

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

vvidic-guest pushed a commit to branch master
in repository resource-agents.

commit ccc9e85d3183fc3b24a2be356c935567f84afb9c
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Wed Mar 22 09:29:17 2017 +0100

    Remove patches applied upstream
    
      02_spelling_fixes.patch
      850787-fix-typo
---
 debian/patches/02_spelling_fixes.patch | 33 ---------------------------------
 debian/patches/850787-fix-typo         | 19 -------------------
 debian/patches/series                  |  2 --
 3 files changed, 54 deletions(-)

diff --git a/debian/patches/02_spelling_fixes.patch b/debian/patches/02_spelling_fixes.patch
deleted file mode 100644
index 2492ed8..0000000
--- a/debian/patches/02_spelling_fixes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/heartbeat/nfsserver
-+++ b/heartbeat/nfsserver
-@@ -39,7 +39,7 @@ nfsserver_meta_data() {
- <version>1.0</version>
- 
- <longdesc lang="en">
--Nfsserver helps to manage the Linux nfs server as a failover-able resource in Linux-HA.
-+Nfsserver helps one to manage the Linux nfs server as a failover-able resource in Linux-HA.
- It depends on Linux specific NFS implementation details, so is considered not portable to other platforms yet.
- </longdesc>
- 
---- a/heartbeat/nginx
-+++ b/heartbeat/nginx
-@@ -721,7 +721,7 @@ Case insensitive.
- Client to use to query to Nginx for level 10 and level 20 tests.
- If not specified, the RA will try to find one on the system.
- Currently, wget and curl are supported, with curl being preferred.
--For example, you can set this paramter to "wget" if you prefer that to curl.
-+For example, you can set this parameter to "wget" if you prefer that to curl.
- </longdesc>
- <shortdesc lang="en">http client</shortdesc>
- <content type="string" />
---- a/heartbeat/scsi2reservation
-+++ b/heartbeat/scsi2reservation
-@@ -35,7 +35,7 @@ scsi-2 reservation
- <parameter name="scsi_reserve" unique="0" required="0">
- <longdesc lang="en">
- The scsi_reserve is a command from scsires package. 
--It helps to issue SCSI-2 reservation on SCSI devices.
-+It helps one to issue SCSI-2 reservation on SCSI devices.
- </longdesc>
- <shortdesc lang="en">Manages exclusive access to shared storage media thrugh SCSI-2 reservations</shortdesc>
- <content type="string" default="/usr/sbin/scsi_reserve" />
diff --git a/debian/patches/850787-fix-typo b/debian/patches/850787-fix-typo
deleted file mode 100644
index 7a20c73..0000000
--- a/debian/patches/850787-fix-typo
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 21e1ffb01f99c4cfd7d06e2023e72cef9e23a10a
-Author: ISHIKAWA Mutsumi <ishikawa at hanzubon.jp>
-Date:   Tue Jan 10 22:47:18 2017 +0100
-
-    Fix typo in IPaddr2
-    
-    Debian #850787
-
---- a/heartbeat/IPaddr2
-+++ b/heartbeat/IPaddr2
-@@ -722,7 +722,7 @@ run_send_ua() {
- 			;;
- 		*tentative*)
- 			if [ $i -eq 10 ]; then
--				ofc_log warn "IPv6 address : DAD is still in tentative"
-+				ocf_log warn "IPv6 address : DAD is still in tentative"
- 			fi
- 			;;
- 		*)
diff --git a/debian/patches/series b/debian/patches/series
index b8d9fd6..c18827d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
 01_docbook_patch.patch
-02_spelling_fixes.patch
 mysql-path.patch
 no-dirty-version
 ipv6-linux-only
-850787-fix-typo
 ocft-configs.patch

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