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

Description

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

Details

Provenance

Authored on Feb 5 2017, 7:09 PM

Parents

rPa39ea6491a6e: Merge pull request #1219 from kgaillot/fail
rP93af2f90fd66: Fix: Improve recovery when demote fails with OCF_NOT_RUNNING

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

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

a39ea6491a6e Merge pull request #1219 from kgaillot/fail
Author
kgaillot
Browse Repository
No Audits
30052abc2311 Low: attrd: ignore unsupported requests in legacy attrd
Author
kgaillot
Browse Repository
No Audits
e5e5065624b6 Refactor: attrd: functionize updating a single attribute in legacy attrd
Author
kgaillot
Browse Repository
No Audits
f6870b1f6e89 Low: attrd,crmd: implement peer remove requests in legacy attrd
Author
kgaillot
Browse Repository
No Audits
1e801beccedf Refactor: attrd: functionize shared heartbeat/corosync request code
Author
kgaillot
Browse Repository
No Audits
89dbc7daa075 Low: crmd: don't clear remote node transient attributes unnecessarily
Author
kgaillot
Browse Repository
No Audits
05592ec90922 Test: lrmd: use pacemaker (not heartbeat) Dummy in versioned params test
Author
kgaillot
Browse Repository
No Audits
540905202bef Test: CTS: don't continue with remote tests if setup fails
Author
kgaillot
Browse Repository
No Audits
84b90b0b0f4d Merge pull request #1218 from jnpkrn/spec
Author
kgaillot
Browse Repository
No Audits
18cd8eb1735e Build: spec: %define back to %global to prevent recursive declaration
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
121178e9491e Merge pull request #1217 from jnpkrn/asctime
Author
kgaillot
Browse Repository
No Audits
a7476dd96e79 Fix: crm_mon: protect against non-standard or failing asctime
Author
Jan Pokorny <jpokorny@redhat.com>
Browse Repository
No Audits
b8118218c0dc Merge pull request #1216 from jnpkrn/libservices
Author
kgaillot
Browse Repository
No Audits
9acc32260562 Low: libservices(sync): partially prevent killing foreign process
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
142169da5951 Low: libservices (sync): ensure no zombie is left behind
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
40ba78a85c5a Merge pull request #1215 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
3a94d53c8dee Low: cib: improve re-sync handling
Author
kgaillot
Browse Repository
No Audits
64c77a733a52 Refactor: cib: remove dead code
Author
kgaillot
Browse Repository
No Audits
8e7515c918d7 Merge pull request #1213 from ioguix/doc-notify-inactive
Author
kgaillot
Browse Repository
No Audits
976a66ded18f doc: Pacemaker Explained: fix paragraph order and spelling error
Author
Jehan-Guillaume de Rorthais <jgdr@dalibo.com>
Browse Repository
No Audits
bd322ee7872c Doc: Pacemaker Explained: remove *notify_inactive_uname variable
Author
Jehan-Guillaume de Rorthais <jgdr@dalibo.com>
Browse Repository
No Audits
5415551e2440 Merge pull request #1212 from kgaillot/fail
Author
kgaillot
Browse Repository
No Audits
95db10602e8f Fix: tools: implement crm_failcount command-line options correctly
Author
kgaillot
Browse Repository
No Audits
d64a5be5eba2 Refactor: tools: use new functions for failure attribute names
Author
kgaillot
Browse Repository
No Audits
a2f5d569ec84 Refactor: libpe_status: put failcount-related functions in own file
Author
kgaillot
Browse Repository
No Audits
08a244d02bf3 Refactor: crmd: separate attrd-related functions into own source file
Author
kgaillot
Browse Repository
No Audits
63850136d459 Low: libcrmcommon: add functions for generating failure attribute names
Author
kgaillot
Browse Repository
No Audits
60b3ee4f6d0b Low: tools: use correct regular expression for fail counts in crm_resource
Author
kgaillot
Browse Repository
No Audits
f4a74a3a97b8 Doc: Pacemaker Explained: clarify require-all behavior
Author
kgaillot
Browse Repository
No Audits
de5c6c73ad20 Low: cib: never disable legacy mode with corosync 1 stacks
Author
kgaillot
Browse Repository
No Audits
df497ff980a9 Log: cib: improve warning when legacy diff fails
Author
kgaillot
Browse Repository
No Audits
eacd1a651d5c Test: tools: make regression test clean up after itself on success
Author
kgaillot
Browse Repository
No Audits
0c2eab4dd768 Test: tools: ignore source code line numbers when comparing validation output
Author
kgaillot
Browse Repository
No Audits
bf5abe5a3ecc Low: libcrmcommon: ensure filename is not NULL before opening
Author
kgaillot
Browse Repository
No Audits
abef9e8bdc04 Low: crmd: be more resilient when checking an LRM command's "from"
Author
kgaillot
Browse Repository
No Audits
6945262003d4 Merge pull request #1211 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
88472dcb3297 Doc: Pacemaker Remote: document remote-connect-timeout introduced in 1.1.10
Author
kgaillot
Browse Repository
No Audits
06efda973f70 Log: crmd: improve crmd's LRM-related log messages
Author
kgaillot
Browse Repository
No Audits
48904806539a Refactor: tools: functionize generating patch in crm_diff
Author
kgaillot
Browse Repository
No Audits
42f98419698e Refactor: tools: functionize applying patch in crm_diff
Author
kgaillot
Browse Repository
No Audits
348bb53ff57a Refactor: tools: separate patch application and generation code in crm_diff
Author
kgaillot
Browse Repository
No Audits
7939e7290536 Refactor: tools: functionize printing patch in crm_diff
Author
kgaillot
Browse Repository
No Audits
c4dccc7256ea Doc: tools: improve crm_diff description/messages
Author
kgaillot
Browse Repository
No Audits
3ce40b1c6897 Build: make crm_diff source name more obvious
Author
kgaillot
Browse Repository
No Audits
7f76fac04968 Refactor: crmd,tools: use new XML convenience function where appropriate
Author
kgaillot
Browse Repository
No Audits
20a74b9d377c Fix: tools: properly ignore version with crm_diff --no-version
Author
kgaillot
Browse Repository
No Audits
302b5ff8e1f1 Low: libcrmcommon: add convenience function for copying XML element
Author
kgaillot
Browse Repository
No Audits
2817a2081e9e Merge pull request #1210 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
1566bd00a919 Log: pengine: spelling corrections
Author
kgaillot
Browse Repository
No Audits
c1bc760d534a Fix: libservices: properly watch writable DBus handles
Author
kgaillot
Browse Repository
No Audits

Changes (118)
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-Advanced-Resources.txt

Ch-Constraints.txt

Ch-Resources.txt

Pacemaker_Remote/

en-US/

Ch-Intro.txt

index.php

security.txt

extra/

alerts/

fencing/

include/

crm/

common/

pengine/

lib/

ais/

cluster/

common/

pengine/

services/

lrmd/

pacemaker_remote.service.in

regression.py.in

mcp/

pacemaker.c

pacemaker.combined.upstart.in

pengine/

regression.core.sh.in

test10/

bug-rh-1097457.summary

guest-node-host-dies.dot

guest-node-host-dies.exp

guest-node-host-dies.scores

guest-node-host-dies.summary

guest-node-host-dies.xml

whitebox-fail1.dot

whitebox-fail1.exp

whitebox-fail1.summary

whitebox-fail2.dot

whitebox-fail2.exp

whitebox-fail2.summary

whitebox-imply-stop-on-fence.dot

whitebox-imply-stop-on-fence.exp

whitebox-imply-stop-on-fence.summary

whitebox-ms-ordering.dot

whitebox-ms-ordering.exp

whitebox-ms-ordering.summary

whitebox-unexpectedly-running.dot

whitebox-unexpectedly-running.exp

whitebox-unexpectedly-running.summary

rpmlintrc

tools/

Makefile.am

	crm_diff.c
	xml_diff.c

crm_resource_runtime.c

fake_transition.c

regression.sh

regression.tools.exp

regression.validity.exp

xml/

rP5f0becd5828a

View Options

.gitattributes

Load File

View Options

.gitignore

Load File

View Options

.tito.spec.tmpl

Load File

View Options

.tito/custom.py

Load File

View Options

.tito/tito.props

Load File

View Options

BasicSanity.sh

Load File

View Options

ChangeLog

Load File

View Options

GNUmakefile

Load File

View Options

Makefile.am

Load File

View Options

attrd/legacy.c

Load File

View Options

cib/main.c

Load File

View Options

cib/messages.c

Load File

View Options

configure.ac

Load File

View Options

crmd/Makefile.am

Load File

View Options

crmd/attrd.c

Load File

View Options

crmd/crmd_lrm.h

Load File

View Options

crmd/lrm.c

Load File

View Options

crmd/messages.c

Load File

View Options

crmd/remote_lrmd_ra.c

Load File

View Options

crmd/te_actions.c

Load File

View Options

crmd/te_callbacks.c

Load File

View Options

crmd/te_events.c

Load File

View Options

crmd/te_utils.c

Load File

View Options

crmd/throttle.c

Load File

View Options

crmd/utils.c

Load File

View Options

cts/CTStests.py

Load File

View Options

cts/patterns.py

Load File

View Options

doc/Makefile.am

Load File

View Options

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

Load File

View Options

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

Load File

View Options

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

Load File

View Options

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

Load File

View Options

doc/index.php

Load File

View Options

doc/security.txt

Load File

View Options

extra/alerts/alert_snmp.sh.sample

Load File

View Options

extra/clustermon.sh

Load File

View Options

fencing/admin.c

Load File

View Options

fencing/commands.c

Load File

View Options

include/crm/common/internal.h

Load File

View Options

include/crm/common/xml.h

Load File

View Options

include/crm/pengine/internal.h

Load File

View Options

include/crm/pengine/status.h

Load File

View Options

lib/ais/plugin.c

Load File

View Options

lib/ais/plugin.h

Load File

View Options

lib/cluster/cpg.c

Load File

View Options

lib/cluster/heartbeat.c

Load File

View Options

lib/common/cib_secrets.c

Load File

View Options

lib/common/schemas.c

Load File

View Options

lib/common/strings.c

Load File

View Options

lib/common/watchdog.c

Load File

View Options

lib/common/xml.c

Load File

View Options

lib/pengine/Makefile.am

Load File

View Options

lib/pengine/failcounts.c

Load File

View Options

lib/pengine/unpack.c

Load File

View Options

lib/pengine/utils.c

Load File

View Options

lib/services/dbus.c

Load File

View Options

lib/services/services_linux.c

Load File

View Options

lib/services/systemd.c

Load File

View Options

lib/services/upstart.c

Load File

View Options

lrmd/pacemaker_remote.service.in

Load File

View Options

lrmd/regression.py.in

Load File

View Options

mcp/pacemaker.c

Load File

View Options

mcp/pacemaker.combined.upstart.in

Load File

View Options

mcp/pacemaker.service.in

Load File

View Options

pacemaker.spec.in

Load File

View Options

pengine/allocate.c

Load File

View Options

pengine/graph.c

Load File

View Options

pengine/native.c

Load File

View Options

pengine/regression.core.sh.in

Load File

View Options

pengine/regression.sh

Load File

View Options

pengine/test10/bug-cl-5247.dot

Load File

View Options

pengine/test10/bug-cl-5247.exp

Load File

View Options

pengine/test10/bug-cl-5247.summary

Load File

View Options

pengine/test10/bug-rh-1097457.dot

Load File

View Options

pengine/test10/bug-rh-1097457.exp

Load File

View Options

pengine/test10/bug-rh-1097457.summary

Load File

View Options

pengine/test10/guest-node-host-dies.dot

Load File

View Options

pengine/test10/guest-node-host-dies.exp

Load File

View Options

pengine/test10/guest-node-host-dies.scores

Load File

View Options

pengine/test10/guest-node-host-dies.summary

Load File

View Options

pengine/test10/guest-node-host-dies.xml

Load File

View Options

pengine/test10/whitebox-fail1.dot

Load File

View Options

pengine/test10/whitebox-fail1.exp

Load File

View Options

pengine/test10/whitebox-fail1.summary

Load File

View Options

pengine/test10/whitebox-fail2.dot

Load File

View Options

pengine/test10/whitebox-fail2.exp

Load File

View Options

pengine/test10/whitebox-fail2.summary

Load File

View Options

pengine/test10/whitebox-imply-stop-on-fence.dot

Load File

View Options

pengine/test10/whitebox-imply-stop-on-fence.exp

Load File

View Options

pengine/test10/whitebox-imply-stop-on-fence.summary

Load File

View Options

pengine/test10/whitebox-ms-ordering.dot

Load File

View Options

pengine/test10/whitebox-ms-ordering.exp

Load File

View Options

pengine/test10/whitebox-ms-ordering.summary

Load File

View Options

pengine/test10/whitebox-unexpectedly-running.dot

Load File

View Options

pengine/test10/whitebox-unexpectedly-running.exp

Load File

View Options

pengine/test10/whitebox-unexpectedly-running.summary

Load File

View Options

rpmlintrc

Load File

View Options

tools/Makefile.am

Load File

View Options

tools/crm_diff.c

Load File

View Options

tools/crm_failcount

Load File

View Options

tools/crm_mon.c

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/fake_transition.c

Load File

View Options

tools/regression.sh

Load File

View Options

tools/regression.tools.exp

Load File

View Options

tools/regression.validity.exp

Load File

View Options

tools/report.common.in

Load File

View Options

tools/xml_diff.c

Load File

View Options

xml/constraints-1.0.rng

Load File

View Options

xml/constraints-1.2.rng

Load File

View Options

xml/constraints-2.1.rng

Load File

View Options

xml/constraints-2.2.rng

Load File

View Options

xml/constraints-2.3.rng

Load File

View Options

xml/constraints-2.6.rng

Load File

View Options

xml/resources-2.7.rng

Load File

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

Description

Details

Event Timeline

Merged Changes

Changes (118)Show All Changes

Very Large Commit

rP5f0becd5828a

.gitattributes

.gitignore

.tito.spec.tmpl

.tito/custom.py

.tito/tito.props

BasicSanity.sh

ChangeLog

GNUmakefile

Makefile.am

attrd/legacy.c

cib/main.c

cib/messages.c

configure.ac

crmd/Makefile.am

crmd/attrd.c

crmd/crmd_lrm.h

crmd/lrm.c

crmd/messages.c

crmd/remote_lrmd_ra.c

crmd/te_actions.c

crmd/te_callbacks.c

crmd/te_events.c

crmd/te_utils.c

crmd/throttle.c

crmd/utils.c

cts/CTStests.py

cts/patterns.py

doc/Makefile.am

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

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

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

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

doc/index.php

doc/security.txt

extra/alerts/alert_snmp.sh.sample

extra/clustermon.sh

fencing/admin.c

fencing/commands.c

include/crm/common/internal.h

include/crm/common/xml.h

include/crm/pengine/internal.h

include/crm/pengine/status.h

lib/ais/plugin.c

lib/ais/plugin.h

lib/cluster/cpg.c

lib/cluster/heartbeat.c

lib/common/cib_secrets.c

lib/common/schemas.c

lib/common/strings.c

lib/common/watchdog.c

lib/common/xml.c

lib/pengine/Makefile.am

lib/pengine/failcounts.c

lib/pengine/unpack.c

lib/pengine/utils.c

lib/services/dbus.c

lib/services/services_linux.c

lib/services/systemd.c

lib/services/upstart.c

lrmd/pacemaker_remote.service.in

lrmd/regression.py.in

mcp/pacemaker.c

mcp/pacemaker.combined.upstart.in

mcp/pacemaker.service.in

pacemaker.spec.in

pengine/allocate.c

pengine/graph.c

pengine/native.c

pengine/regression.core.sh.in

pengine/regression.sh

pengine/test10/bug-cl-5247.dot

pengine/test10/bug-cl-5247.exp

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

Changes (118)
Show All Changes