diff --git a/Doc-Delay-Drop-old-comments.patch b/Doc-Delay-Drop-old-comments.patch new file mode 100644 index 0000000000000000000000000000000000000000..b664564255060cc07d5f1712047f93f7ca68232c --- /dev/null +++ b/Doc-Delay-Drop-old-comments.patch @@ -0,0 +1,58 @@ +From c070a9a4f1d0e9215a72a9481799a4b8a069be10 Mon Sep 17 00:00:00 2001 +From: Reid Wahl +Date: Thu, 7 Mar 2024 12:24:36 -0800 +Subject: [PATCH] Doc: Delay: Drop old comments + +stopdelay and mondelay do not default to startdelay. Should have been +done with fe8a807d. + +Also remove comments that are redundant with the metadata, and remove +descriptions of this as a "test" resource. This has valid uses in some +production environments. + +Signed-off-by: Reid Wahl +--- + heartbeat/Delay | 19 +++---------------- + 1 file changed, 3 insertions(+), 16 deletions(-) + +diff --git a/heartbeat/Delay b/heartbeat/Delay +index 5aa8f460..c96da0e0 100755 +--- a/heartbeat/Delay ++++ b/heartbeat/Delay +@@ -4,22 +4,9 @@ + # Support: users@clusterlabs.org + # License: GNU General Public License (GPL) + # +-# This script is a test resource for introducing delay. ++# This script is a resource for introducing a delay. + # +-# usage: $0 {start|stop|status|monitor|meta-data} +-# +-# OCF parameters are as below: +-# OCF_RESKEY_startdelay +-# OCF_RESKEY_stopdelay +-# OCF_RESKEY_mondelay +-# +-# +-# OCF_RESKEY_startdelay defaults to 20 (seconds) +-# OCF_RESKEY_stopdelay defaults to $OCF_RESKEY_startdelay +-# OCF_RESKEY_mondelay defaults to $OCF_RESKEY_startdelay +-# +-# +-# This is really a test resource script. ++# usage: $0 {start|stop|status|monitor|meta-data} + # + + ####################################################################### +@@ -54,7 +41,7 @@ meta_data() { + 1.0 + + +-This script is a test resource for introducing delay. ++This script is a resource for introducing a delay. + + Waits for a defined timespan + +-- +2.25.1 + diff --git a/resource-agents.spec b/resource-agents.spec index 7071184135e50abdde14dfe8f16e7d6fbe36f041..53660af6dc412caefa30278e007ce992183013d5 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -1,7 +1,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.13.0 -Release: 9 +Release: 10 License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents Source0: https://github.com/ClusterLabs/resource-agents/archive/v%{version}.tar.gz @@ -14,7 +14,7 @@ Patch0005: Avoid-false-positive-for-VG-activation.patch Patch0006: Don-t-build-with-ansi-by-default.patch Patch0007: Fix-docker-RA-behavior-when-Docker-isn-t-running.patch Patch0008: Low-IPaddr2-Remove-stray-backslash.patch - +Patch0009: Doc-Delay-Drop-old-comments.patch Obsoletes: heartbeat-resources <= %{version} Provides: heartbeat-resources = %{version} BuildRequires: automake autoconf pkgconfig gcc perl-interpreter perl-generators python3-devel @@ -112,6 +112,9 @@ export CFLAGS="$(echo '%{optflags}')" %{_mandir}/man8/{ocf-tester.8*,ldirectord.8*} %changelog +* Thu Mar 14 2024 zouzhimin - 4.13.0-10 +- Doc: Delay: Drop old comments + * Fri Mar 01 2024 bizhiyuan - 4.13.0-9 - Low: IPaddr2: Remove stray backslash