Merge pull request #1078 from ClusterLabs/1.1
2b61b3ee50f8
Actions

Description

Merge pull request #1078 from ClusterLabs/1.1

Update master to 1.1.15

Details

Provenance

kgaillot	Authored on Jun 21 2016, 7:46 PM
GitHub <noreply@github.com>	Committed on Jun 21 2016, 7:46 PM

Parents

rPe174ec84857e: Merge pull request #1077 from kgaillot/1.1
rP9bc5ef1eac56: Merge pull request #1054 from bubble75/location-regex-backref

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

e174ec84857e Merge pull request #1077 from kgaillot/1.1
Author
kgaillot
Browse Repository
No Audits
f2bb87d96dca Doc: update change log for 1.1.15
Author
kgaillot
Browse Repository
No Audits
32fa6a5662d6 Log: crmd: mention that graceful remote shutdowns may cause connection failures
Author
kgaillot
Browse Repository
No Audits
8b63892d69e6 Merge pull request #1076 from wenningerk/alert_cleanup
Author
kgaillot
Browse Repository
No Audits
583745509f83 Low: alerts - drop 5min timeout to 30s since it is configurable now
Author
wenningerk
Browse Repository
No Audits
062d0385c3a3 Fix: Bug bz#5292 - crmd: wait for alerts to finish
Author
wenningerk
Browse Repository
No Audits
60730faf4621 Merge pull request #1075 from kgaillot/1.1
Author
kgaillot
Browse Repository
No Audits
e9bf986ae28b Doc: Pacemaker Explained: alert agents should be OK with no recipient
Author
kgaillot
Browse Repository
No Audits
380c1bb3d460 Fix: libais,libcluster,libcrmcommon,liblrmd: don't use %z specifier
Author
kgaillot
Browse Repository
No Audits
2c1f60db1ffe Merge pull request #1074 from wferi/init-provides
Author
kgaillot
Browse Repository
No Audits
4a8d33d0bffc pacemaker_remote: set LSB Provides header to the service name
Author
Ferenc Wágner <wferi@niif.hu>
Browse Repository
No Audits
928757729713 Merge pull request #1073 from kgaillot/1.1
Author
kgaillot
Browse Repository
No Audits
a895923a27b5 Fix: alerts: ensure sample alert agents handle undefined recipient
Author
kgaillot
Browse Repository
No Audits
ba315f17077d Low: tools: crm_resource -T option should not be hidden anymore
Author
kgaillot
Browse Repository
No Audits
47db51f9717b Test: PE: Correctly update the dependant actions of un-runnable clones
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e68b51c266e1 Fix: PE: Correctly update the dependant actions of un-runnable clones
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
45d7f12bfd11 Merge pull request #1071 from wenningerk/alert_cleanup
Author
kgaillot
Browse Repository
No Audits
e36d14d1549f Merge pull request #1069 from gao-yan/attrd-exit-segfault
Author
kgaillot
Browse Repository
No Audits
4ffc323dbc79 fix: alerts: make timestamp-format-string work properly if strftime-escape is…
Author
wenningerk
Browse Repository
No Audits
b66a82bd677d fix: extra: make alert-file-example cope with spaces in timeformat-string
Author
wenningerk
Browse Repository
No Audits
3c62fb1d0dea Fix: attrd,ipc: Prevent possible segfault on exit
Author
gao-yan
Browse Repository
No Audits
9ff6e0509a5a Merge pull request #1061 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
26354da93d48 Merge pull request #1065 from wferi/alert-fixes
Author
kgaillot
Browse Repository
No Audits
b65ddbca6b9e Merge pull request #1068 from wenningerk/alert_cleanup
Author
kgaillot
Browse Repository
No Audits
66f736f1f060 Merge pull request #1067 from HideoYamauchi/change_alert_desc
Author
kgaillot
Browse Repository
No Audits
36cb6b207799 Doc: Pacemaker Explained: typofix and further clarifications in alerts section
Author
wenningerk
Browse Repository
No Audits
647a08e105ff Low: crmd: Change desc of alert of the fencing.
Author
HideoYamauchi
Browse Repository
No Audits
9b5723ab5ca3 alerts: fix SMTP recipient defaulting
Author
Ferenc Wágner <wferi@niif.hu>
Browse Repository
No Audits
d4dfd7d8ed79 alerts: these scripts don't need bash
Author
Ferenc Wágner <wferi@niif.hu>
Browse Repository
No Audits
e928f0bb49dc Merge pull request #1066 from kgaillot/1.1
Author
kgaillot
Browse Repository
No Audits
0fa62622bbb7 Fix: resources: use uname -n instead of hostname in Dummy
Author
kgaillot
Browse Repository
No Audits
09d440cacc47 Test: cts: update patterns for recent log message changes
Author
kgaillot
Browse Repository
No Audits
7130937f2406 Merge pull request #1062 from yuusuke/improbe_logging
Author
kgaillot
Browse Repository
No Audits
5a5cc7dadc16 Improvement of the log
Author
yuusuke <yusk.iida@gmail.com>
Browse Repository
No Audits
f5afdc1badbe Fix: tools: properly handle crm_resource --restart with a resource in a group
Author
kgaillot
Browse Repository
No Audits
847723f7175a Fix: tools: don't assume all resources restart on same node with crm_resource…
Author
kgaillot
Browse Repository
No Audits
aaed9569272a Fix: tools: avoid memory leaks in crm_resource --restart
Author
kgaillot
Browse Repository
No Audits
06cc891dd16b Fix: tools: remember any existing target-role when doing crm_resource --restart
Author
kgaillot
Browse Repository
No Audits
020ff3810c12 Fix: tools: correctly count starting resources when doing crm_resource --restart
Author
kgaillot
Browse Repository
No Audits
dd46368eead0 Merge pull request #1060 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
403e357b8a82 Doc: Pacemaker Explained: correct description of target-role values
Author
kgaillot
Browse Repository
No Audits
5342ef73fc23 Doc: Pacemaker Explained: clarify that alert agents only run on cluster nodes
Author
kgaillot
Browse Repository
No Audits
ce6d04e625a8 Fix: libcrmcommon: really ensure crm_time_t structure is fully initialized by…
Author
kgaillot
Browse Repository
No Audits
27884fef11dc Fix: extra: correct syntax error in sample alert script
Author
kgaillot
Browse Repository
No Audits

Changes (24)

Path

Size

attrd/

crmd/

cts/

doc/

Pacemaker_Explained/

en-US/

Ch-Alerts.txt

Ch-Resources.txt

extra/

alerts/

resources/

include/

crm/

crm.h

lib/

ais/

cluster/

common/

lrmd/

lrmd/

tools/

crm_resource_runtime.c

rP2b61b3ee50f8

View Options

ChangeLog

View Options

attrd/main.c

View Options

crmd/control.c

View Options

crmd/lrm.c

View Options

crmd/lrm_state.c

View Options

crmd/notify.c

View Options

crmd/notify.h

View Options

cts/patterns.py

View Options

doc/Pacemaker_Explained/en-US/Ch-Alerts.txt

View Options

doc/Pacemaker_Explained/en-US/Ch-Resources.txt

View Options

extra/alerts/alert_file.sh.sample

View Options

extra/alerts/alert_smtp.sh.sample

View Options

extra/alerts/alert_snmp.sh.sample

View Options

extra/resources/Dummy

View Options

include/crm/crm.h

View Options

lib/ais/plugin.c

View Options

lib/cluster/cpg.c

View Options

lib/common/ipc.c

View Options

lib/common/iso8601.c

View Options

lib/common/remote.c

View Options

lib/lrmd/lrmd_client.c

View Options

lrmd/pacemaker_remote.in

View Options

tools/crm_resource.c

View Options

tools/crm_resource_runtime.c

Merge pull request #1078 from ClusterLabs/1.12b61b3ee50f8Actions

Description

Details

Event Timeline

Merged Changes

Changes (24)

rP2b61b3ee50f8

ChangeLog

attrd/main.c

crmd/control.c

crmd/lrm.c

crmd/lrm_state.c

crmd/notify.c

crmd/notify.h

cts/patterns.py

doc/Pacemaker_Explained/en-US/Ch-Alerts.txt

doc/Pacemaker_Explained/en-US/Ch-Resources.txt

extra/alerts/alert_file.sh.sample

extra/alerts/alert_smtp.sh.sample

extra/alerts/alert_snmp.sh.sample

extra/resources/Dummy

include/crm/crm.h

lib/ais/plugin.c

lib/cluster/cpg.c

lib/common/ipc.c

lib/common/iso8601.c

lib/common/remote.c

lib/lrmd/lrmd_client.c

lrmd/pacemaker_remote.in

tools/crm_resource.c

tools/crm_resource_runtime.c

Merge pull request #1078 from ClusterLabs/1.1
2b61b3ee50f8
Actions