395f5684d7
...beyond Pacemaker-1.1.14 (commit 5a6cdd1), but restore old-style notifications to the state at Pacemaker-1.1.14 point release (disabled) - Definitely get rid of Corsync v1 (Flatiron) hypothetical support - Remove some of the spec file cruft, not required for years (BuildRoot, AutoReqProv, "clean" scriptlet, etc.) and adapt the file per https://github.com/ClusterLabs/pacemaker/pull/965
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
From 25ce4e9492b1ffea528b6d25b1b1bf82362c241e Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
|
|
Date: Thu, 31 Mar 2016 23:26:22 +0200
|
|
Subject: [PATCH] Revert "Low: crmd: re-enable built-in notifications"
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This reverts commit ea4f3a711486b38f51b7a52d3b39f6d7b621b8da.
|
|
|
|
That was a result of the initial iteration and more sophisticated
|
|
mechanism is down road[1], with an expectation that an attempt to use
|
|
the old will be strongly discouraged (to say the least).
|
|
|
|
Make this apparent for new-comers to Pacemaker and/or users thinking
|
|
about the use of notifications that the old API is a dead end to
|
|
avoid frustration later on.
|
|
|
|
[1] https://github.com/ClusterLabs/pacemaker/pull/950
|
|
|
|
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
|
|
---
|
|
crmd/control.c | 7 -------
|
|
1 file changed, 7 deletions(-)
|
|
|
|
diff --git a/crmd/control.c b/crmd/control.c
|
|
index 53d850e..f3d4732 100644
|
|
--- a/crmd/control.c
|
|
+++ b/crmd/control.c
|
|
@@ -41,13 +41,6 @@
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
|
|
-/* Enable support for built-in notifications
|
|
- *
|
|
- * The interface is expected to change significantly, and this will be defined
|
|
- * in the upstream master branch only until a new design is finalized.
|
|
- */
|
|
-#define RHEL7_COMPAT
|
|
-
|
|
qb_ipcs_service_t *ipcs = NULL;
|
|
|
|
extern gboolean crm_connect_corosync(crm_cluster_t * cluster);
|
|
--
|
|
2.4.3
|
|
|