Diffusion Pacemaker 965befd5947c

Merge pull request #1419 from kgaillot/combine
965befd5947c
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge pull request #1419 from kgaillot/combine

Bring master branch fixes into 2.0 branch

Details

Provenance

kgaillot	Authored on Feb 13 2018, 6:58 PM
GitHub <noreply@github.com>	Committed on Feb 13 2018, 6:58 PM

Parents

rPb2458ce933f4: Test: cts-cli: update regression test with correct output
rP7acb223795e7: Merge pull request #1418 from kgaillot/changes20

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

b2458ce933f4 Test: cts-cli: update regression test with correct output
Author
kgaillot
Browse Repository
No Audits
e1bcd6066e98 Low: libcrmcommon: use /tmp when creating temporary XML file
Author
kgaillot
Browse Repository
No Audits
bba69403bfd0 Fix: tools: auto-merge was insufficient
Author
kgaillot
Browse Repository
No Audits
b10591f0fe29 Test: cts-pengine: update tests from master branch for new code
Author
kgaillot
Browse Repository
No Audits
a1f0bcdf62df Test: cts-pengine: move merged data files to new location
Author
kgaillot
Browse Repository
No Audits
3d2af3f68497 Merge branch 'master' of https://github.com/kgaillot/pacemaker into combine
Author
kgaillot
Browse Repository
No Audits
8bbce2383019 Merge pull request #1412 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
a8b1ded601bb Fix: tools: crm_master should always work on node attribute
Author
kgaillot
Browse Repository
No Audits
e9741ca939ab Merge pull request #1409 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
aecab580390f Fix: tools: crm_resource --cleanup couldn't match clone instances
Author
kgaillot
Browse Repository
No Audits
30eb9a980db1 Low: tools: crm_resource --refresh should ignore --operation and --interval
Author
kgaillot
Browse Repository
No Audits
93b77f40c6d2 Low: crmd: quorum gain should always cause new transition
Author
kgaillot
Browse Repository
No Audits
cd8f984c7a15 Fix: rhbz#1527072 - Correctly observe colocation constraints with bundles in…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
f643935fa754 Bug rhbz#1519812 - Prevent notify actions from causing --wait to hang
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
0d8c767d2a35 Merge pull request #1398 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
6f89cd6f332b Test: PE: add tests for recovery after failed demote
Author
kgaillot
Browse Repository
No Audits
a962eb7f2aca Low: libpe_status: recover after failed demote when appropriate
Author
kgaillot
Browse Repository
No Audits
26ebf94d3da3 Merge pull request #1394 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
e9a7e3bb4d2d Fix: lrmd: always use most recent remote proxy
Author
kgaillot
Browse Repository
No Audits
1392d3f20e95 Low: libpe_status: limit resource type check to primitives
Author
kgaillot
Browse Repository
No Audits
7e3213c68098 Doc: PE: update remote stop ordering comments for recent changes
Author
kgaillot
Browse Repository
No Audits
2cb28f896800 Low: PE: correct mispelled constant
Author
kgaillot
Browse Repository
No Audits
5dd6eae98deb Test: PE: Ensure stop operations occur after stopped remote connections have…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7758ecb7f582 Fix: PE: Ensure stop operations occur after stopped remote connections have…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1c6c22afb682 Fix: PE: Remote connection resources are safe to to require only quorum
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
03041d7c05b2 Fix: PE: Only allowed nodes need to be considered when ordering resource…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d96e87130df3 Fix: PE: Ordering bundle child stops/demotes after container fencing causes…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
33f50f601af8 Fix: PE: Passing boolean instead of a pointer
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits

Changes (80)

Path

Size

crmd/

cts/

cli/

regression.validity.exp

pengine/

bug-rh-1097457.dot

bug-rh-1097457.exp

bug-rh-1097457.summary

bundle-order-fencing.dot

bundle-order-fencing.exp

bundle-order-fencing.summary

bundle-order-stop-on-remote.dot

bundle-order-stop-on-remote.exp

bundle-order-stop-on-remote.scores

bundle-order-stop-on-remote.summary

bundle-order-stop-on-remote.xml

failed-demote-recovery-master.dot

failed-demote-recovery-master.exp

failed-demote-recovery-master.scores

failed-demote-recovery-master.summary

failed-demote-recovery-master.xml

failed-demote-recovery.dot

failed-demote-recovery.exp

failed-demote-recovery.scores

failed-demote-recovery.summary

failed-demote-recovery.xml

guest-node-host-dies.dot

guest-node-host-dies.exp

guest-node-host-dies.summary

remote-fence-unclean.dot

remote-fence-unclean.exp

remote-partial-migrate2.dot

remote-partial-migrate2.exp

remote-partial-migrate2.summary

remote-recover-all.dot

remote-recover-all.exp

remote-recover-all.summary

remote-recover-connection.dot

remote-recover-connection.exp

remote-recover-connection.summary

remote-recover-fail.dot

remote-recover-fail.exp

remote-recover-no-resources.dot

remote-recover-no-resources.exp

remote-recover-no-resources.summary

remote-recover-unknown.dot

remote-recover-unknown.exp

remote-recover-unknown.summary

remote-recovery.dot

remote-recovery.exp

remote-recovery.summary

remote-unclean2.dot

remote-unclean2.exp

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

include/

crm/

pengine/

lib/

common/

pengine/

lrmd/

pengine/

tools/

crm_resource_runtime.c

rP965befd5947c

crmd/membership.c

Loading...

crmd/te_utils.c

Loading...

crmd/tengine.h

Loading...

cts/cli/regression.validity.exp

Loading...

cts/cts-pengine.in

Loading...

cts/pengine/bug-rh-1097457.dot

Loading...

cts/pengine/bug-rh-1097457.exp

Loading...

cts/pengine/bug-rh-1097457.summary

Loading...

cts/pengine/bundle-order-fencing.dot

Loading...

cts/pengine/bundle-order-fencing.exp

Loading...

cts/pengine/bundle-order-fencing.summary

Loading...

cts/pengine/bundle-order-stop-on-remote.dot

Loading...

cts/pengine/bundle-order-stop-on-remote.exp

Loading...

cts/pengine/bundle-order-stop-on-remote.scores

Loading...

cts/pengine/bundle-order-stop-on-remote.summary

Loading...

cts/pengine/bundle-order-stop-on-remote.xml

Loading...

cts/pengine/failed-demote-recovery-master.dot

Loading...

cts/pengine/failed-demote-recovery-master.exp

Loading...

cts/pengine/failed-demote-recovery-master.scores

Loading...

cts/pengine/failed-demote-recovery-master.summary

Loading...

cts/pengine/failed-demote-recovery-master.xml

Loading...

cts/pengine/failed-demote-recovery.dot

Loading...

cts/pengine/failed-demote-recovery.exp

Loading...

cts/pengine/failed-demote-recovery.scores

Loading...

cts/pengine/failed-demote-recovery.summary

Loading...

cts/pengine/failed-demote-recovery.xml

Loading...

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

Loading...

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

Loading...

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

Loading...

cts/pengine/remote-fence-unclean.dot

Loading...

cts/pengine/remote-fence-unclean.exp

Loading...

cts/pengine/remote-partial-migrate2.dot

Loading...

cts/pengine/remote-partial-migrate2.exp

Loading...

cts/pengine/remote-partial-migrate2.summary

Loading...

cts/pengine/remote-recover-all.dot

Loading...

cts/pengine/remote-recover-all.exp

Loading...

cts/pengine/remote-recover-all.summary

Loading...

cts/pengine/remote-recover-connection.dot

Loading...

cts/pengine/remote-recover-connection.exp

Loading...

cts/pengine/remote-recover-connection.summary

Loading...

cts/pengine/remote-recover-fail.dot

Loading...

cts/pengine/remote-recover-fail.exp

Loading...

cts/pengine/remote-recover-no-resources.dot

Loading...

cts/pengine/remote-recover-no-resources.exp

Loading...

cts/pengine/remote-recover-no-resources.summary

Loading...

cts/pengine/remote-recover-unknown.dot

Loading...

cts/pengine/remote-recover-unknown.exp

Loading...

cts/pengine/remote-recover-unknown.summary

Loading...

cts/pengine/remote-recovery.dot

Loading...

cts/pengine/remote-recovery.exp

Loading...

cts/pengine/remote-recovery.summary

Loading...

cts/pengine/remote-unclean2.dot

Loading...

cts/pengine/remote-unclean2.exp

Loading...

cts/pengine/whitebox-fail1.dot

Loading...

cts/pengine/whitebox-fail1.exp

Loading...

cts/pengine/whitebox-fail1.summary

Loading...

cts/pengine/whitebox-fail2.dot

Loading...

cts/pengine/whitebox-fail2.exp

Loading...

cts/pengine/whitebox-fail2.summary

Loading...

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

Loading...

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

Loading...

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

Loading...

cts/pengine/whitebox-ms-ordering.dot

Loading...

cts/pengine/whitebox-ms-ordering.exp

Loading...

cts/pengine/whitebox-ms-ordering.summary

Loading...

cts/pengine/whitebox-unexpectedly-running.dot

Loading...

cts/pengine/whitebox-unexpectedly-running.exp

Loading...

include/crm/pengine/status.h

Loading...

lib/common/schemas.c

Loading...

lib/pengine/complex.c

Loading...

lib/pengine/container.c

Loading...

lib/pengine/unpack.c

Loading...

lib/pengine/utils.c

Loading...

lrmd/ipc_proxy.c

Loading...

pengine/allocate.c

Loading...

pengine/container.c

Loading...

pengine/native.c

Loading...

tools/crm_master

Loading...

tools/crm_resource.c

Loading...

tools/crm_resource_runtime.c

Loading...