Merge pull request #1058 from ClusterLabs/1.1
1eecb85c1378
Actions

Description

Merge pull request #1058 from ClusterLabs/1.1

Update master to 1.1.15-rc4

Details

Provenance

kgaillot	Authored on Jun 10 2016, 5:59 PM
GitHub <noreply@github.com>	Committed on Jun 10 2016, 5:59 PM

Parents

rP25920dbdbc75: Merge pull request #1057 from kgaillot/fixes
rP5570636b37dc: Merge pull request #1030 from ClusterLabs/1.1

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

25920dbdbc75 Merge pull request #1057 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
f5914a9be5b5 Doc: update change log for 1.1.15-rc4
Author
kgaillot
Browse Repository
No Audits
a50be1651ef6 Fix: crmd: avoid timeout on older peers when cancelling a resource operation
Author
kgaillot
Browse Repository
No Audits
4edc3b83bc10 Merge pull request #1049 from HideoYamauchi/1.1
Author
kgaillot
Browse Repository
No Audits
caf135cfaf87 Merge pull request #1052 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
a82de2e8ee4f Fix: crmd: use proper resource agent name when caching metadata
Author
kgaillot
Browse Repository
No Audits
e4c435394fb2 Fix: crmd: avoid memory leak when sending fencing alert
Author
kgaillot
Browse Repository
No Audits
27d58a580adb Fix: liblrmd: avoid memory leak when closing or deleting lrmd connections
Author
kgaillot
Browse Repository
No Audits
c2684cc893f8 Build: use new %CONFIGDIR% variable wherever appropriate
Author
kgaillot
Browse Repository
No Audits
ad00c8a54173 Low: extra: improve determination of successful monitors in SNMP alert script
Author
kgaillot
Browse Repository
No Audits
2270ae36c9e0 Fix: tools: avoid memory leak when crm_mon unpacks constraints
Author
kgaillot
Browse Repository
No Audits
41dd34090e02 Fix: pengine: avoid use-after-free with location constraint + sets + templates
Author
kgaillot
Browse Repository
No Audits
03743bd258b7 Fix: pengine: better error handling when unpacking sets in location constraints
Author
kgaillot
Browse Repository
No Audits
7e4a8a575efc Fix: pengine: avoid memory leak when invalid constraint involves set
Author
kgaillot
Browse Repository
No Audits
cd143722f77a Refactor: pengine: reduce code duplication when unpacking location constraints
Author
kgaillot
Browse Repository
No Audits
4693a15f9f1c Test: cts: avoid kill usage error if DummySD stop called when already stopped
Author
kgaillot
Browse Repository
No Audits
9cdae519e389 Doc: Pacemaker Explained: update alerts chapter for new sample script names
Author
kgaillot
Browse Repository
No Audits
de1d2d4caccc Low: extra: update sample alert scripts for new names and general cleanup
Author
kgaillot
Browse Repository
No Audits
c66c4ded58b0 Build: rename sample alert scripts and install them in datadir
Author
kgaillot
Browse Repository
No Audits
9e10977f3896 Merge pull request #1050 from jnpkrn/fix-typos
Author
kgaillot
Browse Repository
No Audits
aa28ccffcf8f Fix: adjust a message type in the comment per 09b6e82
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
4b55683daeb8 Fix typos: add missing apostrophes (it's, everyone's, wasn't)
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
1712950ff016 Fix typos: compatability -> compatibility
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
815b1de8d70e Mid : pengine : Correction of the record judgment of the failed information.
Author
HideoYamauchi
Browse Repository
No Audits
61a000d352cc Merge pull request #1047 from jnpkrn/refactor-attrd_update_delegate-options
Author
kgaillot
Browse Repository
No Audits
ecf9163c0dc1 Refactor: use DIMOF macro consistently
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
1e55f4cd50fa Refactor: attrd_update_delegate: reflect 737732f (bool->bitmask)
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
1a05449500f0 Merge pull request #1046 from wenningerk/alert_cleanup
Author
kgaillot
Browse Repository
No Audits
9b418ac8c955 Merge pull request #1045 from jnpkrn/fix-typos
Author
kgaillot
Browse Repository
No Audits
b5dc00500fb6 fix: alert-helpers: some fixes in pcmk_smtp_helper.sh
Author
wenningerk
Browse Repository
No Audits
665b2e42f282 Merge pull request #1044 from wenningerk/alert_cleanup
Author
kgaillot
Browse Repository
No Audits
246ec645637c Fix typos: dont -> don't
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
7f19aaa0e6e7 Fix typos: ad -> bad, Becaues -> Because
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
650dddac752f fix: alert-helpers: fixed if statement + removed quotes snmptrap seems to be…
Author
wenningerk
Browse Repository
No Audits
6d9044465625 Merge pull request #1043 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
83b570ef4cf3 Doc: Pacemaker Explained: enhance alerts chapter
Author
kgaillot
Browse Repository
No Audits
e8b73be7e377 Fix: libpengine: log message when stonith disabled, not enabled
Author
kgaillot
Browse Repository
No Audits
6e2897c29002 Fix: pengine: only set unfencing constraints once
Author
kgaillot
Browse Repository
No Audits
8c33be1c70d6 Refactor: libfencing: initialize status before using when executing fencing…
Author
kgaillot
Browse Repository
No Audits
d30f9b793d05 Refactor: crmd: remove dead code
Author
kgaillot
Browse Repository
No Audits
2f7efc06c07d Fix: tools: don't require node to be known to crm_resource when deleting…
Author
kgaillot
Browse Repository
No Audits
fa537f2266b6 Fix: libcrmcommon: ensure crm_time_t structure is fully initialized by API calls
Author
kgaillot
Browse Repository
No Audits
d0b5152c8e68 Refactor: libcrmcommon: avoid memory reallocation when getting relative xpath
Author
kgaillot
Browse Repository
No Audits
c51f5d768c3f Fix: attrd: don't leak memory when returning due to malformed update request
Author
kgaillot
Browse Repository
No Audits
c66839bfb38f Fix: crmd: always free result of crm_itoa()
Author
kgaillot
Browse Repository
No Audits
0402f27af331 Merge pull request #1041 from wenningerk/alert_cleanup
Author
kgaillot
Browse Repository
No Audits
1c855c5f0e73 Mid: added sample script for alerts vis SMTP
Author
wenningerk
Browse Repository
No Audits
65381c0c6003 Low: extra: a little more quoting of variables in SNMP alert scripts
Author
wenningerk
Browse Repository
No Audits
3a3ee2db7277 Doc: added documentation for alerts-feature (removed ClusterMon)
Author
wenningerk
Browse Repository
No Audits
adc2a010834d Merge pull request #1040 from jnpkrn/straightening-4657ad0-up
Author
kgaillot
Browse Repository
No Audits

Changes (130)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

attrd/

cib/

crmd/

cts/

doc/

Pacemaker_Explained/

en-US/

Ch-Alerts.txt

Ch-Notifications.txt

Pacemaker_Explained.xml

Pacemaker_Remote/

en-US/

Ch-Options.txt

extra/

Makefile.am

	alerts/

alerts/

resources/

fencing/

include/

crm/

cluster/

lib/

cib/

cluster/

common/

fencing/

lrmd/

pengine/

services/

lrmd/

pacemaker_remote.service.in

mcp/

pacemaker.c

pacemaker.combined.upstart.in

pengine/

test10/

bug-5143-ms-shuffle.summary

clone-no-shuffle.summary

coloc-clone-stays-active.summary

colocation_constraint_stops_master.summary

colocation_constraint_stops_slave.summary

master-colocation.summary

master-depend.summary

master-failed-demote-2.summary

master-failed-demote.summary

master-group.summary

master-ordering.summary

master-partially-demoted-group.summary

master-reattach.summary

migrate-partial-4.summary

order_constraint_stops_master.summary

order_constraint_stops_slave.summary

unmanaged-master.summary

use-after-free-merge.summary

tools/

crm_resource_runtime.c

report.collector

xml/

crm_mon.rng

rP1eecb85c1378

View Options

ChangeLog

Load File

View Options

attrd/commands.c

Load File

View Options

cib/callbacks.c

Load File

View Options

cib/remote.c

Load File

View Options

configure.ac

Load File

View Options

crmd/control.c

Load File

View Options

crmd/fsa_defines.h

Load File

View Options

crmd/heartbeat.c

Load File

View Options

crmd/join_client.c

Load File

View Options

crmd/join_dc.c

Load File

View Options

crmd/lrm.c

Load File

View Options

crmd/notify.c

Load File

View Options

crmd/te_actions.c

Load File

View Options

crmd/te_callbacks.c

Load File

View Options

crmd/te_utils.c

Load File

View Options

crmd/utils.c

Load File

View Options

cts/CIB.py

Load File

View Options

cts/HBDummy.in

Load File

View Options

cts/LSBDummy.in

Load File

View Options

cts/environment.py

Load File

View Options

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

Load File

View Options

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

Load File

View Options

doc/Pacemaker_Explained/en-US/Pacemaker_Explained.xml

Load File

View Options

doc/Pacemaker_Remote/en-US/Ch-Options.txt

Load File

View Options

extra/Makefile.am

Load File

View Options

extra/alerts/Makefile.am

Load File

View Options

extra/alerts/alert_file.sh.sample

Load File

View Options

extra/alerts/alert_smtp.sh.sample

Load File

View Options

extra/alerts/alert_snmp.sh.sample

Load File

View Options

extra/alerts/pcmk_alert_sample.sh

Load File

View Options

extra/alerts/pcmk_snmp_helper.sh

Load File

View Options

extra/cluster-clean

Load File

View Options

extra/resources/controld

Load File

View Options

extra/resources/o2cb

Load File

View Options

fencing/admin.c

Load File

View Options

fencing/regression.py.in

Load File

View Options

include/crm/cluster.h

Load File

View Options

include/crm/cluster/internal.h

Load File

View Options

include/crm/compatibility.h

Load File

View Options

include/crm/stonith-ng.h

Load File

View Options

include/crm_config.h.in

Load File

View Options

lib/cib/cib_file.c

Load File

View Options

lib/cluster/cpg.c

Load File

View Options

lib/cluster/heartbeat.c

Load File

View Options

lib/cluster/legacy.c

Load File

View Options

lib/common/digest.c

Load File

View Options

lib/common/iso8601.c

Load File

View Options

lib/common/logging.c

Load File

View Options

lib/common/mainloop.c

Load File

View Options

lib/common/xml.c

Load File

View Options

lib/common/xpath.c

Load File

View Options

lib/fencing/st_client.c

Load File

View Options

lib/lrmd/lrmd_client.c

Load File

View Options

lib/pengine/clone.c

Load File

View Options

lib/pengine/native.c

Load File

View Options

lib/pengine/unpack.c

Load File

View Options

lib/pengine/utils.c

Load File

View Options

lib/services/systemd.c

Load File

View Options

lrmd/lrmd.c

Load File

View Options

lrmd/pacemaker_remote.in

Load File

View Options

lrmd/pacemaker_remote.service.in

Load File

View Options

mcp/pacemaker.c

Load File

View Options

mcp/pacemaker.combined.upstart.in

Load File

View Options

mcp/pacemaker.in

Load File

View Options

mcp/pacemaker.service.in

Load File

View Options

mcp/pacemaker.upstart.in

Load File

View Options

pacemaker.spec.in

Load File

View Options

pengine/allocate.c

Load File

View Options

pengine/constraints.c

Load File

View Options

pengine/graph.c

Load File

View Options

pengine/master.c

Load File

View Options

pengine/native.c

Load File

View Options

pengine/pengine.h

Load File

View Options

pengine/test10/asymmetric.summary

Load File

View Options

pengine/test10/bug-1765.summary

Load File

View Options

pengine/test10/bug-1822.summary

Load File

View Options

pengine/test10/bug-5059.summary

Load File

View Options

pengine/test10/bug-5143-ms-shuffle.summary

Load File

View Options

pengine/test10/bug-cl-5168.summary

Load File

View Options

pengine/test10/bug-cl-5212.summary

Load File

View Options

pengine/test10/bug-lf-2317.summary

Load File

View Options

pengine/test10/bug-pm-11.summary

Load File

View Options

pengine/test10/bug-pm-12.summary

Load File

View Options

pengine/test10/clone-no-shuffle.summary

Load File

View Options

pengine/test10/coloc-clone-stays-active.summary

Load File

View Options

pengine/test10/colocation_constraint_stops_master.summary

Load File

View Options

pengine/test10/colocation_constraint_stops_slave.summary

Load File

View Options

pengine/test10/inc11.summary

Load File

View Options

pengine/test10/inc12.summary

Load File

View Options

pengine/test10/master-0.summary

Load File

View Options

pengine/test10/master-1.summary

Load File

View Options

pengine/test10/master-10.summary

Load File

View Options

pengine/test10/master-11.summary

Load File

View Options

pengine/test10/master-12.summary

Load File

View Options

pengine/test10/master-13.summary

Load File

View Options

pengine/test10/master-2.summary

Load File

View Options

pengine/test10/master-3.summary

Load File

View Options

pengine/test10/master-4.summary

Load File

View Options

pengine/test10/master-5.summary

Load File

View Options

pengine/test10/master-6.summary

Load File

View Options

pengine/test10/master-7.summary

Load File

View Options

pengine/test10/master-8.summary

Load File

View Options

pengine/test10/master-colocation.summary

Load File

View Options

pengine/test10/master-depend.summary

Load File

View Options

pengine/test10/master-failed-demote-2.summary

Load File

View Options

pengine/test10/master-failed-demote.summary

Load File

View Options

pengine/test10/master-group.summary

Load File

View Options

pengine/test10/master-ordering.summary

Load File

View Options

pengine/test10/master-partially-demoted-group.summary

Load File

View Options

pengine/test10/master-reattach.summary

Load File

View Options

pengine/test10/migrate-partial-4.summary

Load File

View Options

pengine/test10/order_constraint_stops_master.summary

Load File

View Options

pengine/test10/order_constraint_stops_slave.summary

Load File

View Options

pengine/test10/probe-2.summary

Load File

View Options

pengine/test10/rec-node-13.summary

Load File

View Options

pengine/test10/stonith-0.summary

Load File

View Options

pengine/test10/stonith-1.summary

Load File

View Options

pengine/test10/stonith-2.summary

Load File

View Options

pengine/test10/unmanaged-master.summary

Load File

View Options

pengine/test10/use-after-free-merge.summary

Load File

View Options

pengine/utils.c

Load File

View Options

tools/crm_attribute.c

Load File

View Options

tools/crm_mon.c

Load File

View Options

tools/crm_mon.service.in

Load File

View Options

tools/crm_mon.upstart.in

Load File

View Options

tools/crm_report.in

Load File

View Options

tools/crm_resource.c

Load File

View Options

tools/crm_resource_runtime.c

Load File

View Options

tools/report.collector

Load File

View Options

xml/crm_mon.rng

Load File

Merge pull request #1058 from ClusterLabs/1.11eecb85c1378Actions

Description

Details

Event Timeline

Merged Changes

Changes (130)Show All Changes

Very Large Commit

rP1eecb85c1378

ChangeLog

attrd/commands.c

cib/callbacks.c

cib/remote.c

configure.ac

crmd/control.c

crmd/fsa_defines.h

crmd/heartbeat.c

crmd/join_client.c

crmd/join_dc.c

crmd/lrm.c

crmd/notify.c

crmd/te_actions.c

crmd/te_callbacks.c

crmd/te_utils.c

crmd/utils.c

cts/CIB.py

cts/HBDummy.in

cts/LSBDummy.in

cts/environment.py

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

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

doc/Pacemaker_Explained/en-US/Pacemaker_Explained.xml

doc/Pacemaker_Remote/en-US/Ch-Options.txt

extra/Makefile.am

extra/alerts/Makefile.am

extra/alerts/alert_file.sh.sample

extra/alerts/alert_smtp.sh.sample

extra/alerts/alert_snmp.sh.sample

extra/alerts/pcmk_alert_sample.sh

extra/alerts/pcmk_snmp_helper.sh

extra/cluster-clean

extra/resources/controld

extra/resources/o2cb

fencing/admin.c

fencing/regression.py.in

include/crm/cluster.h

include/crm/cluster/internal.h

include/crm/compatibility.h

include/crm/stonith-ng.h

include/crm_config.h.in

lib/cib/cib_file.c

lib/cluster/cpg.c

lib/cluster/heartbeat.c

lib/cluster/legacy.c

lib/common/digest.c

lib/common/iso8601.c

lib/common/logging.c

lib/common/mainloop.c

lib/common/xml.c

lib/common/xpath.c

lib/fencing/st_client.c

lib/lrmd/lrmd_client.c

lib/pengine/clone.c

lib/pengine/native.c

lib/pengine/unpack.c

lib/pengine/utils.c

lib/services/systemd.c

lrmd/lrmd.c

lrmd/pacemaker_remote.in

lrmd/pacemaker_remote.service.in

mcp/pacemaker.c

mcp/pacemaker.combined.upstart.in

mcp/pacemaker.in

mcp/pacemaker.service.in

mcp/pacemaker.upstart.in

pacemaker.spec.in

pengine/allocate.c

pengine/constraints.c

pengine/graph.c

pengine/master.c

pengine/native.c

Merge pull request #1058 from ClusterLabs/1.1
1eecb85c1378
Actions

Changes (130)
Show All Changes