[Debian-ha-commits] [pacemaker] 68/69: Delete rejected RA description patch

[Christoph Berg]

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

myon pushed a commit to branch debian/master
in repository pacemaker.

commit fdbb9ab2886bcf456310ed264b600c38bf43b6ac
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Sun Jan 17 21:55:36 2016 +0100

    Delete rejected RA description patch
    
    https://github.com/ClusterLabs/pacemaker/pull/888#issuecomment-171732737:
    
      We don't want this info in the metadata, because this is the metadata
      returned for the "real" agent (i.e.
      "crm_resource --show-metadata=ocf:pacemaker:remote").
      This info would be better as just a comment in the source.
---
 ...he-description-of-the-remote-agent-script.patch | 33 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 34 deletions(-)

diff --git a/debian/patches/Extend-the-description-of-the-remote-agent-script.patch b/debian/patches/Extend-the-description-of-the-remote-agent-script.patch
deleted file mode 100644
index f5bd2df..0000000
--- a/debian/patches/Extend-the-description-of-the-remote-agent-script.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
-Date: Sun, 13 Sep 2015 19:59:05 +0200
-Subject: Extend the description of the remote agent script
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Ferenc Wágner <wferi at niif.hu>
----
- extra/resources/remote |   10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/extra/resources/remote b/extra/resources/remote
-index 447267e..b6cb36f 100644
---- a/extra/resources/remote
-+++ b/extra/resources/remote
-@@ -44,8 +44,14 @@ meta_data() {
- <?xml version="1.0"?>
- <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
- <resource-agent name="remote" version="0.1">
--<version>0.1</version>
--<shortdesc lang="en">remote resource agent</shortdesc>
-+  <version>0.1</version>
-+  <shortdesc lang="en">provide metadata for the remote connection agent</shortdesc>
-+  <longdesc lang="en">
-+This resource agent script only provides the metadata of the internal
-+remote lrmd connection agent to announce its parameters.  All other
-+operations are unsupported.  The actual functionality lives within the
-+crmd component of pacemaker.
-+  </longdesc>
-   <parameters>
-     <parameter name="server" unique="1">
-     <longdesc lang="en">
diff --git a/debian/patches/series b/debian/patches/series
index bde2a86..0751f78 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@ Debianize-pacemaker_remote.service.patch
 Synchronize-the-provided-name-with-the-filename.patch
 Restarting-pacemaker-adds-confusion-only.patch
 Enable-redirecting-etc-init.d-script-calls-to-system.patch
-Extend-the-description-of-the-remote-agent-script.patch

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