Permalink
Browse files

Merge branch 'master' of github.com:ClusterLabs/pacemaker

  • Loading branch information...
beekhof committed Mar 27, 2017
2 parents 3ffafe0 + 0401f26 commit 4574333e01288d477eea1fd0f9db581f40538a75
View
@@ -41,7 +41,7 @@ crmd_LDADD = $(top_builddir)/lib/fencing/libstonithd.la \
$(top_builddir)/lib/lrmd/liblrmd.la \
$(CLUSTERLIBS)
crmd_SOURCES = main.c crmd.c corosync.c notify.c \
crmd_SOURCES = main.c crmd.c corosync.c crmd_alerts.c \
fsa.c control.c messages.c membership.c callbacks.c attrd.c \
election.c join_client.c join_dc.c subsystems.c throttle.c \
cib.c pengine.c tengine.c lrm.c lrm_state.c remote_lrmd_ra.c \
View
@@ -146,7 +146,7 @@ peer_update_callback(enum crm_status_type type, crm_node_t * node, const void *d
}
}
crmd_notify_node_event(node);
crmd_alert_node_event(node);
break;
case crm_status_processes:
View
@@ -1035,7 +1035,7 @@ config_query_callback(xmlNode * msg, int call_id, int rc, xmlNode * output, void
#ifdef RHEL7_COMPAT
script = crmd_pref(config_hash, "notification-agent");
value = crmd_pref(config_hash, "notification-recipient");
crmd_enable_notifications(script, value);
crmd_enable_alerts(script, value);
#endif
value = crmd_pref(config_hash, XML_CONFIG_ATTR_DC_DEADTIME);
@@ -1095,7 +1095,7 @@ config_query_callback(xmlNode * msg, int call_id, int rc, xmlNode * output, void
}
alerts = first_named_child(output, XML_CIB_TAG_ALERTS);
parse_notifications(alerts);
parse_alerts(alerts);
set_bit(fsa_input_register, R_READ_CONFIG);
crm_trace("Triggering FSA: %s", __FUNCTION__);
Oops, something went wrong.

0 comments on commit 4574333

Please sign in to comment.