Merge pull request #845 from kgaillot/1.1

Release 1.1.14-rc2
ClusterLabs · Dec 9, 2015 · d3313a6 · d3313a6
2 parents a1356ee + a9f7945
commit d3313a6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+* Tue Dec 08 2015 Ken Gaillot <[email protected]> Pacemaker-1.1.14-rc2-1
+- Update source tarball to revision: ce830a7
+- Changesets: 1
+- Diff:       1 file changed, 2 insertions(+)
+
+- Changes since Pacemaker-1.1.14-rc1
+  + crmd: ensure compilation works with built-in notifications disabled
 
 * Tue Dec 08 2015 Ken Gaillot <[email protected]> Pacemaker-1.1.14-rc1-1
 - Update source tarball to revision: 7cd6dcf

diff --git a/crmd/control.c b/crmd/control.c
@@ -966,7 +966,9 @@ crmd_pref(GHashTable * options, const char *name)
 static void
 config_query_callback(xmlNode * msg, int call_id, int rc, xmlNode * output, void *user_data)
 {
+#ifdef RHEL7_COMPAT
     const char *script = NULL;
+#endif
     const char *value = NULL;
     GHashTable *config_hash = NULL;
     crm_time_t *now = crm_time_new(NULL);