git: 0a71208d4f0c - main - net/pacemaker2: update to 2.1.5

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Florian Smeets <flo_at_FreeBSD.org>
Date: Mon, 22 May 2023 18:00:57 UTC
The branch main has been updated by flo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0a71208d4f0c269612da53e3d8ebd08e2931c2a0

commit 0a71208d4f0c269612da53e3d8ebd08e2931c2a0
Author:     Florian Millet <florian.millet@laposte.net>
AuthorDate: 2023-05-22 17:56:49 +0000
Commit:     Florian Smeets <flo@FreeBSD.org>
CommitDate: 2023-05-22 17:56:49 +0000

    net/pacemaker2: update to 2.1.5
    
    PR:             270620
---
 net/pacemaker2/Makefile  |   5 +-
 net/pacemaker2/distinfo  |   6 +-
 net/pacemaker2/pkg-plist | 247 ++++++++++++++++++++++++++++++++---------------
 3 files changed, 173 insertions(+), 85 deletions(-)

diff --git a/net/pacemaker2/Makefile b/net/pacemaker2/Makefile
index c30976ffa110..5d4717856055 100644
--- a/net/pacemaker2/Makefile
+++ b/net/pacemaker2/Makefile
@@ -1,5 +1,4 @@
-PORTVERSION=		2.1.2
-PORTREVISION=	4
+PORTVERSION=		2.1.5
 PKGNAMESUFFIX=		2
 
 WWW=		https://www.clusterlabs.org/pacemaker/
@@ -20,6 +19,8 @@ LIB_DEPENDS+=		libffi.so:devel/libffi \
 	libtasn1.so:security/libtasn1 \
 	libunistring.so:devel/libunistring
 
+USES+=	gettext
+
 post-patch: post-patch-common
 
 post-install:
diff --git a/net/pacemaker2/distinfo b/net/pacemaker2/distinfo
index 2d8e5ac824ba..104ae8cf2989 100644
--- a/net/pacemaker2/distinfo
+++ b/net/pacemaker2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642612065
-SHA256 (ClusterLabs-pacemaker-Pacemaker-2.1.2_GH0.tar.gz) = 954bd25aeafb4556df711cab4e8fc648965c8ce013d4c2559aafa2036a7ad2c3
-SIZE (ClusterLabs-pacemaker-Pacemaker-2.1.2_GH0.tar.gz) = 5092063
+TIMESTAMP = 1678191983
+SHA256 (ClusterLabs-pacemaker-Pacemaker-2.1.5_GH0.tar.gz) = 7654b78f08d4994b9fd31b8592addbd7f4b173e2cbf30336722419f1ce45e185
+SIZE (ClusterLabs-pacemaker-Pacemaker-2.1.5_GH0.tar.gz) = 5807791
diff --git a/net/pacemaker2/pkg-plist b/net/pacemaker2/pkg-plist
index 15c20625aef9..0e4808998168 100644
--- a/net/pacemaker2/pkg-plist
+++ b/net/pacemaker2/pkg-plist
@@ -4,14 +4,18 @@ etc/sysconfig/pacemaker
 include/pacemaker/crm/cib.h
 include/pacemaker/crm/cib/cib_types.h
 include/pacemaker/crm/cib/util.h
+include/pacemaker/crm/cib/util_compat.h
 include/pacemaker/crm/cluster.h
 include/pacemaker/crm/cluster/compat.h
 include/pacemaker/crm/common/acl.h
 include/pacemaker/crm/common/agents.h
 include/pacemaker/crm/common/agents_compat.h
+include/pacemaker/crm/common/cib.h
 include/pacemaker/crm/common/ipc.h
+include/pacemaker/crm/common/ipc_attrd_internal.h
 include/pacemaker/crm/common/ipc_controld.h
 include/pacemaker/crm/common/ipc_pacemakerd.h
+include/pacemaker/crm/common/ipc_schedulerd.h
 include/pacemaker/crm/common/iso8601.h
 include/pacemaker/crm/common/logging.h
 include/pacemaker/crm/common/logging_compat.h
@@ -20,6 +24,7 @@ include/pacemaker/crm/common/mainloop_compat.h
 include/pacemaker/crm/common/nvpair.h
 include/pacemaker/crm/common/output.h
 include/pacemaker/crm/common/results.h
+include/pacemaker/crm/common/results_compat.h
 include/pacemaker/crm/common/util.h
 include/pacemaker/crm/common/util_compat.h
 include/pacemaker/crm/common/xml.h
@@ -45,39 +50,39 @@ include/pacemaker/crm_config.h
 lib/libcib.a
 lib/libcib.so
 lib/libcib.so.27
-lib/libcib.so.27.2.1
+lib/libcib.so.27.3.1
 lib/libcrmcluster.a
 lib/libcrmcluster.so
 lib/libcrmcluster.so.29
-lib/libcrmcluster.so.29.0.8
+lib/libcrmcluster.so.29.0.10
 lib/libcrmcommon.a
 lib/libcrmcommon.so
 lib/libcrmcommon.so.34
-lib/libcrmcommon.so.34.8.0
+lib/libcrmcommon.so.34.10.0
 lib/libcrmservice.a
 lib/libcrmservice.so
 lib/libcrmservice.so.28
-lib/libcrmservice.so.28.2.5
+lib/libcrmservice.so.28.3.1
 lib/liblrmd.a
 lib/liblrmd.so
 lib/liblrmd.so.28
-lib/liblrmd.so.28.1.3
+lib/liblrmd.so.28.1.5
 lib/libpacemaker.a
 lib/libpacemaker.so
 lib/libpacemaker.so.1
-lib/libpacemaker.so.1.3.0
+lib/libpacemaker.so.1.5.0
 lib/libpe_rules.a
 lib/libpe_rules.so
 lib/libpe_rules.so.26
-lib/libpe_rules.so.26.3.1
+lib/libpe_rules.so.26.3.3
 lib/libpe_status.a
 lib/libpe_status.so
 lib/libpe_status.so.28
-lib/libpe_status.so.28.4.2
+lib/libpe_status.so.28.5.1
 lib/libstonithd.a
 lib/libstonithd.so
 lib/libstonithd.so.26
-lib/libstonithd.so.26.7.0
+lib/libstonithd.so.26.8.2
 lib/ocf/resource.d/pacemaker/ClusterMon
 lib/ocf/resource.d/pacemaker/Dummy
 lib/ocf/resource.d/pacemaker/HealthCPU
@@ -85,7 +90,6 @@ lib/ocf/resource.d/pacemaker/HealthIOWait
 lib/ocf/resource.d/pacemaker/HealthSMART
 lib/ocf/resource.d/pacemaker/Stateful
 lib/ocf/resource.d/pacemaker/SysInfo
-lib/ocf/resource.d/pacemaker/SystemHealth
 lib/ocf/resource.d/pacemaker/attribute
 lib/ocf/resource.d/pacemaker/controld
 lib/ocf/resource.d/pacemaker/ifspeed
@@ -93,18 +97,16 @@ lib/ocf/resource.d/pacemaker/o2cb
 lib/ocf/resource.d/pacemaker/ping
 lib/ocf/resource.d/pacemaker/remote
 %%PYTHON_SITELIBDIR%%/cts/CIB.py
-%%PYTHON_SITELIBDIR%%/cts/ClusterManager.py
 %%PYTHON_SITELIBDIR%%/cts/CM_corosync.py
 %%PYTHON_SITELIBDIR%%/cts/CTS.py
 %%PYTHON_SITELIBDIR%%/cts/CTSaudits.py
 %%PYTHON_SITELIBDIR%%/cts/CTSscenarios.py
 %%PYTHON_SITELIBDIR%%/cts/CTStests.py
 %%PYTHON_SITELIBDIR%%/cts/CTSvars.py
+%%PYTHON_SITELIBDIR%%/cts/ClusterManager.py
 %%PYTHON_SITELIBDIR%%/cts/__init__.py
 %%PYTHON_SITELIBDIR%%/cts/__pycache__/CIB%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/cts/__pycache__/CIB%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/ClusterManager%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/ClusterManager%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_corosync%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_corosync%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/cts/__pycache__/CTS%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -117,6 +119,8 @@ lib/ocf/resource.d/pacemaker/remote
 %%PYTHON_SITELIBDIR%%/cts/__pycache__/CTStests%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSvars%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSvars%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/ClusterManager%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/ClusterManager%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/cts/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/cts/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/cts/__pycache__/cib_xml%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -164,7 +168,6 @@ libexec/pacemaker/pacemaker-schedulerd
 %%MANPAGES%%man/man7/ocf_pacemaker_HealthSMART.7.gz
 %%MANPAGES%%man/man7/ocf_pacemaker_Stateful.7.gz
 %%MANPAGES%%man/man7/ocf_pacemaker_SysInfo.7.gz
-%%MANPAGES%%man/man7/ocf_pacemaker_SystemHealth.7.gz
 %%MANPAGES%%man/man7/ocf_pacemaker_attribute.7.gz
 %%MANPAGES%%man/man7/ocf_pacemaker_controld.7.gz
 %%MANPAGES%%man/man7/ocf_pacemaker_ifspeed.7.gz
@@ -233,10 +236,12 @@ sbin/stonith_admin
 %%PORTDOCS%%%%DOCSDIR%%/licenses/RevisedBSD
 %%DATADIR%%/acls-1.2.rng
 %%DATADIR%%/acls-2.0.rng
+%%DATADIR%%/acls-3.8.rng
 %%DATADIR%%/alerts-2.10.rng
 %%DATADIR%%/alerts-2.5.rng
 %%DATADIR%%/alerts-2.9.rng
 %%DATADIR%%/alerts-3.5.rng
+%%DATADIR%%/alerts-%%PYTHON_VER%%.rng
 %%DATADIR%%/alerts/alert_file.sh.sample
 %%DATADIR%%/alerts/alert_smtp.sh.sample
 %%DATADIR%%/alerts/alert_snmp.sh.sample
@@ -244,56 +249,95 @@ sbin/stonith_admin
 %%DATADIR%%/api/api-result-1.1.rng
 %%DATADIR%%/api/api-result-2.0.rng
 %%DATADIR%%/api/api-result-2.1.rng
+%%DATADIR%%/api/api-result-2.10.rng
+%%DATADIR%%/api/api-result-2.11.rng
+%%DATADIR%%/api/api-result-2.12.rng
+%%DATADIR%%/api/api-result-2.13.rng
+%%DATADIR%%/api/api-result-2.14.rng
+%%DATADIR%%/api/api-result-2.15.rng
+%%DATADIR%%/api/api-result-2.16.rng
+%%DATADIR%%/api/api-result-2.17.rng
+%%DATADIR%%/api/api-result-2.18.rng
+%%DATADIR%%/api/api-result-2.19.rng
 %%DATADIR%%/api/api-result-2.2.rng
+%%DATADIR%%/api/api-result-2.20.rng
+%%DATADIR%%/api/api-result-2.21.rng
+%%DATADIR%%/api/api-result-2.22.rng
+%%DATADIR%%/api/api-result-2.23.rng
+%%DATADIR%%/api/api-result-2.24.rng
+%%DATADIR%%/api/api-result-2.25.rng
 %%DATADIR%%/api/api-result-2.3.rng
 %%DATADIR%%/api/api-result-2.4.rng
 %%DATADIR%%/api/api-result-2.6.rng
 %%DATADIR%%/api/api-result-2.7.rng
 %%DATADIR%%/api/api-result-2.8.rng
 %%DATADIR%%/api/api-result-2.9.rng
-%%DATADIR%%/api/api-result-2.10.rng
-%%DATADIR%%/api/api-result-2.11.rng
-%%DATADIR%%/api/api-result-2.12.rng
-%%DATADIR%%/api/api-result-2.13.rng
-%%DATADIR%%/api/api-result-2.14.rng
 %%DATADIR%%/api/api-result-next.rng
 %%DATADIR%%/api/api-result.rng
 %%DATADIR%%/api/command-output-1.0.rng
+%%DATADIR%%/api/command-output-2.23.rng
+%%DATADIR%%/api/crm_attribute-2.17.rng
+%%DATADIR%%/api/crm_attribute-2.18.rng
+%%DATADIR%%/api/crm_error-2.23.rng
 %%DATADIR%%/api/crm_mon-2.0.rng
 %%DATADIR%%/api/crm_mon-2.1.rng
+%%DATADIR%%/api/crm_mon-2.12.rng
+%%DATADIR%%/api/crm_mon-2.13.rng
+%%DATADIR%%/api/crm_mon-2.15.rng
+%%DATADIR%%/api/crm_mon-2.19.rng
 %%DATADIR%%/api/crm_mon-2.2.rng
+%%DATADIR%%/api/crm_mon-2.21.rng
+%%DATADIR%%/api/crm_mon-2.24.rng
+%%DATADIR%%/api/crm_mon-2.25.rng
 %%DATADIR%%/api/crm_mon-2.3.rng
 %%DATADIR%%/api/crm_mon-2.4.rng
 %%DATADIR%%/api/crm_mon-2.7.rng
 %%DATADIR%%/api/crm_mon-2.8.rng
 %%DATADIR%%/api/crm_mon-2.9.rng
-%%DATADIR%%/api/crm_mon-2.12.rng
-%%DATADIR%%/api/crm_mon-2.13.rng
+%%DATADIR%%/api/crm_resource-2.11.rng
+%%DATADIR%%/api/crm_resource-2.14.rng
+%%DATADIR%%/api/crm_resource-2.20.rng
+%%DATADIR%%/api/crm_resource-2.22.rng
+%%DATADIR%%/api/crm_resource-2.23.rng
+%%DATADIR%%/api/crm_resource-2.24.rng
 %%DATADIR%%/api/crm_resource-2.4.rng
 %%DATADIR%%/api/crm_resource-2.6.rng
 %%DATADIR%%/api/crm_resource-2.7.rng
-%%DATADIR%%/api/crm_resource-2.11.rng
-%%DATADIR%%/api/crm_resource-2.14.rng
-%%DATADIR%%/api/crm_simulate-2.8.rng
+%%DATADIR%%/api/crm_rule-2.16.rng
 %%DATADIR%%/api/crm_simulate-2.12.rng
+%%DATADIR%%/api/crm_simulate-2.19.rng
+%%DATADIR%%/api/crm_simulate-2.21.rng
+%%DATADIR%%/api/crm_simulate-2.24.rng
+%%DATADIR%%/api/crm_simulate-2.8.rng
+%%DATADIR%%/api/crmadmin-2.25.rng
 %%DATADIR%%/api/crmadmin-2.4.rng
 %%DATADIR%%/api/digests-2.6.rng
 %%DATADIR%%/api/digests-2.9.rng
 %%DATADIR%%/api/failure-2.8.rng
 %%DATADIR%%/api/fence-event-2.0.rng
+%%DATADIR%%/api/fence-event-2.15.rng
 %%DATADIR%%/api/generic-list-2.4.rng
 %%DATADIR%%/api/item-1.1.rng
 %%DATADIR%%/api/node-attrs-2.8.rng
 %%DATADIR%%/api/node-history-2.12.rng
+%%DATADIR%%/api/nodes-2.19.rng
+%%DATADIR%%/api/nodes-2.21.rng
+%%DATADIR%%/api/nodes-2.24.rng
 %%DATADIR%%/api/nodes-2.8.rng
 %%DATADIR%%/api/pacemakerd-2.10.rng
+%%DATADIR%%/api/pacemakerd-health-2.25.rng
+%%DATADIR%%/api/resources-2.24.rng
 %%DATADIR%%/api/resources-2.4.rng
 %%DATADIR%%/api/status-2.0.rng
 %%DATADIR%%/api/stonith_admin-1.0.rng
 %%DATADIR%%/api/stonith_admin-1.1.rng
 %%DATADIR%%/api/stonith_admin-2.0.rng
 %%DATADIR%%/api/stonith_admin-2.1.rng
+%%DATADIR%%/api/stonith_admin-2.15.rng
+%%DATADIR%%/api/stonith_admin-2.23.rng
+%%DATADIR%%/api/subprocess-output-2.23.rng
 %%DATADIR%%/api/version-2.0.rng
+%%DATADIR%%/base/access-render-2.xsl
 %%DATADIR%%/cib-1.0.rng
 %%DATADIR%%/cib-1.2.rng
 %%DATADIR%%/constraints-1.0.rng
@@ -307,6 +351,7 @@ sbin/stonith_admin
 %%DATADIR%%/constraints-3.5.rng
 %%DATADIR%%/constraints-3.6.rng
 %%DATADIR%%/constraints-3.7.rng
+%%DATADIR%%/constraints-%%PYTHON_VER%%.rng
 %%DATADIR%%/constraints-next.rng
 %%DATADIR%%/crm_mon.rng
 %%DATADIR%%/fencing-1.2.rng
@@ -318,16 +363,19 @@ sbin/stonith_admin
 %%DATADIR%%/nodes-3.0.rng
 %%DATADIR%%/nodes-3.4.rng
 %%DATADIR%%/nodes-3.5.rng
+%%DATADIR%%/nodes-%%PYTHON_VER%%.rng
 %%DATADIR%%/nvset-1.3.rng
 %%DATADIR%%/nvset-2.9.rng
 %%DATADIR%%/nvset-3.0.rng
 %%DATADIR%%/nvset-3.4.rng
 %%DATADIR%%/nvset-3.5.rng
+%%DATADIR%%/nvset-%%PYTHON_VER%%.rng
 %%DATADIR%%/nvset.rng
 %%DATADIR%%/options-1.0.rng
 %%DATADIR%%/options-3.0.rng
 %%DATADIR%%/options-3.4.rng
 %%DATADIR%%/options-3.5.rng
+%%DATADIR%%/options-%%PYTHON_VER%%.rng
 %%DATADIR%%/pacemaker-1.0.rng
 %%DATADIR%%/pacemaker-1.2.rng
 %%DATADIR%%/pacemaker-1.3.rng
@@ -350,6 +398,8 @@ sbin/stonith_admin
 %%DATADIR%%/pacemaker-3.5.rng
 %%DATADIR%%/pacemaker-3.6.rng
 %%DATADIR%%/pacemaker-3.7.rng
+%%DATADIR%%/pacemaker-3.8.rng
+%%DATADIR%%/pacemaker-%%PYTHON_VER%%.rng
 %%DATADIR%%/pacemaker-next.rng
 %%DATADIR%%/pacemaker.rng
 %%DATADIR%%/report.collector
@@ -367,9 +417,11 @@ sbin/stonith_admin
 %%DATADIR%%/resources-3.4.rng
 %%DATADIR%%/resources-3.5.rng
 %%DATADIR%%/resources-3.7.rng
+%%DATADIR%%/resources-%%PYTHON_VER%%.rng
 %%DATADIR%%/rule-2.9.rng
 %%DATADIR%%/rule-3.4.rng
 %%DATADIR%%/rule-3.5.rng
+%%DATADIR%%/rule-%%PYTHON_VER%%.rng
 %%DATADIR%%/rule.rng
 %%DATADIR%%/score.rng
 %%DATADIR%%/status-1.0.rng
@@ -379,20 +431,25 @@ sbin/stonith_admin
 %%DATADIR%%/tests/cli/constraints.xml
 %%DATADIR%%/tests/cli/crm_diff_new.xml
 %%DATADIR%%/tests/cli/crm_diff_old.xml
+%%DATADIR%%/tests/cli/crm_mon-T180.xml
+%%DATADIR%%/tests/cli/crm_mon-feature_set.xml
 %%DATADIR%%/tests/cli/crm_mon-partial.xml
 %%DATADIR%%/tests/cli/crm_mon-unmanaged.xml
 %%DATADIR%%/tests/cli/crm_mon.xml
 %%DATADIR%%/tests/cli/crm_resource_digests.xml
 %%DATADIR%%/tests/cli/crmadmin-cluster-remote-guest-nodes.xml
+%%DATADIR%%/tests/cli/regression.access_render.exp
 %%DATADIR%%/tests/cli/regression.acls.exp
 %%DATADIR%%/tests/cli/regression.crm_mon.exp
+%%DATADIR%%/tests/cli/regression.daemons.exp
 %%DATADIR%%/tests/cli/regression.dates.exp
+%%DATADIR%%/tests/cli/regression.error_codes.exp
+%%DATADIR%%/tests/cli/regression.feature_set.exp
 %%DATADIR%%/tests/cli/regression.rules.exp
 %%DATADIR%%/tests/cli/regression.tools.exp
 %%DATADIR%%/tests/cli/regression.upgrade.exp
 %%DATADIR%%/tests/cli/regression.validity.exp
 %%DATADIR%%/tests/cts-cli
-%%DATADIR%%/tests/cts-coverage
 %%DATADIR%%/tests/cts-exec
 %%DATADIR%%/tests/cts-fencing
 %%DATADIR%%/tests/cts-regression
@@ -434,6 +491,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/dot/994.dot
 %%DATADIR%%/tests/scheduler/dot/a-demote-then-b-migrate.dot
 %%DATADIR%%/tests/scheduler/dot/a-promote-then-b-migrate.dot
+%%DATADIR%%/tests/scheduler/dot/allow-unhealthy-nodes.dot
 %%DATADIR%%/tests/scheduler/dot/anon-instance-pending.dot
 %%DATADIR%%/tests/scheduler/dot/anti-colocation-order.dot
 %%DATADIR%%/tests/scheduler/dot/anti-colocation-promoted.dot
@@ -524,6 +582,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/dot/bug-rh-1097457.dot
 %%DATADIR%%/tests/scheduler/dot/bug-rh-880249.dot
 %%DATADIR%%/tests/scheduler/dot/bug-suse-707150.dot
+%%DATADIR%%/tests/scheduler/dot/bundle-connection-with-container.dot
 %%DATADIR%%/tests/scheduler/dot/bundle-nested-colocation.dot
 %%DATADIR%%/tests/scheduler/dot/bundle-order-fencing.dot
 %%DATADIR%%/tests/scheduler/dot/bundle-order-partial-start-2.dot
@@ -547,8 +606,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/dot/clone-anon-failcount.dot
 %%DATADIR%%/tests/scheduler/dot/clone-anon-probe-1.dot
 %%DATADIR%%/tests/scheduler/dot/clone-anon-probe-2.dot
-%%DATADIR%%/tests/scheduler/dot/clone-colocate-instance-1.dot
-%%DATADIR%%/tests/scheduler/dot/clone-colocate-instance-2.dot
 %%DATADIR%%/tests/scheduler/dot/clone-fail-block-colocation.dot
 %%DATADIR%%/tests/scheduler/dot/clone-interleave-1.dot
 %%DATADIR%%/tests/scheduler/dot/clone-interleave-2.dot
@@ -556,7 +613,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/dot/clone-max-zero.dot
 %%DATADIR%%/tests/scheduler/dot/clone-no-shuffle.dot
 %%DATADIR%%/tests/scheduler/dot/clone-order-16instances.dot
-%%DATADIR%%/tests/scheduler/dot/clone-order-instance.dot
 %%DATADIR%%/tests/scheduler/dot/clone-order-primitive.dot
 %%DATADIR%%/tests/scheduler/dot/clone-require-all-1.dot
 %%DATADIR%%/tests/scheduler/dot/clone-require-all-2.dot
@@ -607,6 +663,8 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/dot/colocated-utilization-primitive-1.dot
 %%DATADIR%%/tests/scheduler/dot/colocated-utilization-primitive-2.dot
 %%DATADIR%%/tests/scheduler/dot/colocation-influence.dot
+%%DATADIR%%/tests/scheduler/dot/colocation-priority-group.dot
+%%DATADIR%%/tests/scheduler/dot/colocation-vs-stickiness.dot
 %%DATADIR%%/tests/scheduler/dot/colocation_constraint_stops_promoted.dot
 %%DATADIR%%/tests/scheduler/dot/colocation_constraint_stops_unpromoted.dot
 %%DATADIR%%/tests/scheduler/dot/comments.dot
@@ -627,11 +685,16 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/dot/dc-fence-ordering.dot
 %%DATADIR%%/tests/scheduler/dot/enforce-colo1.dot
 %%DATADIR%%/tests/scheduler/dot/expire-non-blocked-failure.dot
+%%DATADIR%%/tests/scheduler/dot/expired-failed-probe-primitive.dot
 %%DATADIR%%/tests/scheduler/dot/failcount-block.dot
 %%DATADIR%%/tests/scheduler/dot/failcount.dot
 %%DATADIR%%/tests/scheduler/dot/failed-demote-recovery-promoted.dot
 %%DATADIR%%/tests/scheduler/dot/failed-demote-recovery.dot
+%%DATADIR%%/tests/scheduler/dot/failed-probe-clone.dot
+%%DATADIR%%/tests/scheduler/dot/failed-probe-primitive.dot
 %%DATADIR%%/tests/scheduler/dot/force-anon-clone-max.dot
+%%DATADIR%%/tests/scheduler/dot/group-anticolocation.dot
+%%DATADIR%%/tests/scheduler/dot/group-colocation-failure.dot
 %%DATADIR%%/tests/scheduler/dot/group-dependents.dot
 %%DATADIR%%/tests/scheduler/dot/group-fail.dot
 %%DATADIR%%/tests/scheduler/dot/group-stop-ordering.dot
@@ -720,7 +783,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/dot/migrate-stop.dot
 %%DATADIR%%/tests/scheduler/dot/migrate-stop_start.dot
 %%DATADIR%%/tests/scheduler/dot/migrate-success.dot
-%%DATADIR%%/tests/scheduler/dot/migrate-versioned.dot
 %%DATADIR%%/tests/scheduler/dot/migration-behind-migrating-remote.dot
 %%DATADIR%%/tests/scheduler/dot/migration-ping-pong.dot
 %%DATADIR%%/tests/scheduler/dot/minimal.dot
@@ -811,6 +873,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/dot/params-4.dot
 %%DATADIR%%/tests/scheduler/dot/params-5.dot
 %%DATADIR%%/tests/scheduler/dot/params-6.dot
+%%DATADIR%%/tests/scheduler/dot/partial-live-migration-multiple-active.dot
 %%DATADIR%%/tests/scheduler/dot/per-node-attrs.dot
 %%DATADIR%%/tests/scheduler/dot/per-op-failcount.dot
 %%DATADIR%%/tests/scheduler/dot/placement-capacity.dot
@@ -824,6 +887,8 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/dot/probe-3.dot
 %%DATADIR%%/tests/scheduler/dot/probe-4.dot
 %%DATADIR%%/tests/scheduler/dot/probe-pending-node.dot
+%%DATADIR%%/tests/scheduler/dot/probe-target-of-failed-migrate_to-1.dot
+%%DATADIR%%/tests/scheduler/dot/probe-target-of-failed-migrate_to-2.dot
 %%DATADIR%%/tests/scheduler/dot/probe-timeout.dot
 %%DATADIR%%/tests/scheduler/dot/promoted-0.dot
 %%DATADIR%%/tests/scheduler/dot/promoted-1.dot
@@ -862,6 +927,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/dot/promoted-score-startup.dot
 %%DATADIR%%/tests/scheduler/dot/promoted-stop.dot
 %%DATADIR%%/tests/scheduler/dot/promoted-unmanaged-monitor.dot
+%%DATADIR%%/tests/scheduler/dot/promoted-with-blocked.dot
 %%DATADIR%%/tests/scheduler/dot/promoted_monitor_restart.dot
 %%DATADIR%%/tests/scheduler/dot/quorum-1.dot
 %%DATADIR%%/tests/scheduler/dot/quorum-2.dot
@@ -896,7 +962,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/dot/rec-rsc-8.dot
 %%DATADIR%%/tests/scheduler/dot/rec-rsc-9.dot
 %%DATADIR%%/tests/scheduler/dot/reload-becomes-restart.dot
-%%DATADIR%%/tests/scheduler/dot/reload-versioned.dot
 %%DATADIR%%/tests/scheduler/dot/remote-connection-shutdown.dot
 %%DATADIR%%/tests/scheduler/dot/remote-connection-unrecoverable.dot
 %%DATADIR%%/tests/scheduler/dot/remote-disable.dot
@@ -925,7 +990,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/dot/remote-unclean2.dot
 %%DATADIR%%/tests/scheduler/dot/reprobe-target_rc.dot
 %%DATADIR%%/tests/scheduler/dot/resource-discovery.dot
-%%DATADIR%%/tests/scheduler/dot/restart-versioned.dot
+%%DATADIR%%/tests/scheduler/dot/restart-with-extra-op-params.dot
 %%DATADIR%%/tests/scheduler/dot/route-remote-notify.dot
 %%DATADIR%%/tests/scheduler/dot/rsc-defaults-2.dot
 %%DATADIR%%/tests/scheduler/dot/rsc-defaults.dot
@@ -984,6 +1049,8 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/dot/stop-failure-no-fencing.dot
 %%DATADIR%%/tests/scheduler/dot/stop-failure-no-quorum.dot
 %%DATADIR%%/tests/scheduler/dot/stop-failure-with-fencing.dot
+%%DATADIR%%/tests/scheduler/dot/stop-unexpected-2.dot
+%%DATADIR%%/tests/scheduler/dot/stop-unexpected.dot
 %%DATADIR%%/tests/scheduler/dot/stopped-monitor-00.dot
 %%DATADIR%%/tests/scheduler/dot/stopped-monitor-01.dot
 %%DATADIR%%/tests/scheduler/dot/stopped-monitor-02.dot
@@ -1173,6 +1240,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/dot/unrunnable-2.dot
 %%DATADIR%%/tests/scheduler/dot/use-after-free-merge.dot
 %%DATADIR%%/tests/scheduler/dot/utilization-check-allowed-nodes.dot
+%%DATADIR%%/tests/scheduler/dot/utilization-complex.dot
 %%DATADIR%%/tests/scheduler/dot/utilization-order1.dot
 %%DATADIR%%/tests/scheduler/dot/utilization-order2.dot
 %%DATADIR%%/tests/scheduler/dot/utilization-order3.dot
@@ -1180,11 +1248,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/dot/utilization-shuffle.dot
 %%DATADIR%%/tests/scheduler/dot/utilization.dot
 %%DATADIR%%/tests/scheduler/dot/value-source.dot
-%%DATADIR%%/tests/scheduler/dot/versioned-operations-1.dot
-%%DATADIR%%/tests/scheduler/dot/versioned-operations-2.dot
-%%DATADIR%%/tests/scheduler/dot/versioned-operations-3.dot
-%%DATADIR%%/tests/scheduler/dot/versioned-operations-4.dot
-%%DATADIR%%/tests/scheduler/dot/versioned-resources.dot
 %%DATADIR%%/tests/scheduler/dot/whitebox-asymmetric.dot
 %%DATADIR%%/tests/scheduler/dot/whitebox-fail1.dot
 %%DATADIR%%/tests/scheduler/dot/whitebox-fail2.dot
@@ -1227,6 +1290,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/exp/994.exp
 %%DATADIR%%/tests/scheduler/exp/a-demote-then-b-migrate.exp
 %%DATADIR%%/tests/scheduler/exp/a-promote-then-b-migrate.exp
+%%DATADIR%%/tests/scheduler/exp/allow-unhealthy-nodes.exp
 %%DATADIR%%/tests/scheduler/exp/anon-instance-pending.exp
 %%DATADIR%%/tests/scheduler/exp/anti-colocation-order.exp
 %%DATADIR%%/tests/scheduler/exp/anti-colocation-promoted.exp
@@ -1317,6 +1381,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/exp/bug-rh-1097457.exp
 %%DATADIR%%/tests/scheduler/exp/bug-rh-880249.exp
 %%DATADIR%%/tests/scheduler/exp/bug-suse-707150.exp
+%%DATADIR%%/tests/scheduler/exp/bundle-connection-with-container.exp
 %%DATADIR%%/tests/scheduler/exp/bundle-nested-colocation.exp
 %%DATADIR%%/tests/scheduler/exp/bundle-order-fencing.exp
 %%DATADIR%%/tests/scheduler/exp/bundle-order-partial-start-2.exp
@@ -1340,8 +1405,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/exp/clone-anon-failcount.exp
 %%DATADIR%%/tests/scheduler/exp/clone-anon-probe-1.exp
 %%DATADIR%%/tests/scheduler/exp/clone-anon-probe-2.exp
-%%DATADIR%%/tests/scheduler/exp/clone-colocate-instance-1.exp
-%%DATADIR%%/tests/scheduler/exp/clone-colocate-instance-2.exp
 %%DATADIR%%/tests/scheduler/exp/clone-fail-block-colocation.exp
 %%DATADIR%%/tests/scheduler/exp/clone-interleave-1.exp
 %%DATADIR%%/tests/scheduler/exp/clone-interleave-2.exp
@@ -1349,7 +1412,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/exp/clone-max-zero.exp
 %%DATADIR%%/tests/scheduler/exp/clone-no-shuffle.exp
 %%DATADIR%%/tests/scheduler/exp/clone-order-16instances.exp
-%%DATADIR%%/tests/scheduler/exp/clone-order-instance.exp
 %%DATADIR%%/tests/scheduler/exp/clone-order-primitive.exp
 %%DATADIR%%/tests/scheduler/exp/clone-require-all-1.exp
 %%DATADIR%%/tests/scheduler/exp/clone-require-all-2.exp
@@ -1400,6 +1462,8 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/exp/colocated-utilization-primitive-1.exp
 %%DATADIR%%/tests/scheduler/exp/colocated-utilization-primitive-2.exp
 %%DATADIR%%/tests/scheduler/exp/colocation-influence.exp
+%%DATADIR%%/tests/scheduler/exp/colocation-priority-group.exp
+%%DATADIR%%/tests/scheduler/exp/colocation-vs-stickiness.exp
 %%DATADIR%%/tests/scheduler/exp/colocation_constraint_stops_promoted.exp
 %%DATADIR%%/tests/scheduler/exp/colocation_constraint_stops_unpromoted.exp
 %%DATADIR%%/tests/scheduler/exp/comments.exp
@@ -1420,11 +1484,16 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/exp/dc-fence-ordering.exp
 %%DATADIR%%/tests/scheduler/exp/enforce-colo1.exp
 %%DATADIR%%/tests/scheduler/exp/expire-non-blocked-failure.exp
+%%DATADIR%%/tests/scheduler/exp/expired-failed-probe-primitive.exp
 %%DATADIR%%/tests/scheduler/exp/failcount-block.exp
 %%DATADIR%%/tests/scheduler/exp/failcount.exp
 %%DATADIR%%/tests/scheduler/exp/failed-demote-recovery-promoted.exp
 %%DATADIR%%/tests/scheduler/exp/failed-demote-recovery.exp
+%%DATADIR%%/tests/scheduler/exp/failed-probe-clone.exp
+%%DATADIR%%/tests/scheduler/exp/failed-probe-primitive.exp
 %%DATADIR%%/tests/scheduler/exp/force-anon-clone-max.exp
+%%DATADIR%%/tests/scheduler/exp/group-anticolocation.exp
+%%DATADIR%%/tests/scheduler/exp/group-colocation-failure.exp
 %%DATADIR%%/tests/scheduler/exp/group-dependents.exp
 %%DATADIR%%/tests/scheduler/exp/group-fail.exp
 %%DATADIR%%/tests/scheduler/exp/group-stop-ordering.exp
@@ -1513,7 +1582,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/exp/migrate-stop.exp
 %%DATADIR%%/tests/scheduler/exp/migrate-stop_start.exp
 %%DATADIR%%/tests/scheduler/exp/migrate-success.exp
-%%DATADIR%%/tests/scheduler/exp/migrate-versioned.exp
 %%DATADIR%%/tests/scheduler/exp/migration-behind-migrating-remote.exp
 %%DATADIR%%/tests/scheduler/exp/migration-ping-pong.exp
 %%DATADIR%%/tests/scheduler/exp/minimal.exp
@@ -1604,6 +1672,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/exp/params-4.exp
 %%DATADIR%%/tests/scheduler/exp/params-5.exp
 %%DATADIR%%/tests/scheduler/exp/params-6.exp
+%%DATADIR%%/tests/scheduler/exp/partial-live-migration-multiple-active.exp
 %%DATADIR%%/tests/scheduler/exp/per-node-attrs.exp
 %%DATADIR%%/tests/scheduler/exp/per-op-failcount.exp
 %%DATADIR%%/tests/scheduler/exp/placement-capacity.exp
@@ -1617,6 +1686,8 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/exp/probe-3.exp
 %%DATADIR%%/tests/scheduler/exp/probe-4.exp
 %%DATADIR%%/tests/scheduler/exp/probe-pending-node.exp
+%%DATADIR%%/tests/scheduler/exp/probe-target-of-failed-migrate_to-1.exp
+%%DATADIR%%/tests/scheduler/exp/probe-target-of-failed-migrate_to-2.exp
 %%DATADIR%%/tests/scheduler/exp/probe-timeout.exp
 %%DATADIR%%/tests/scheduler/exp/promoted-0.exp
 %%DATADIR%%/tests/scheduler/exp/promoted-1.exp
@@ -1655,6 +1726,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/exp/promoted-score-startup.exp
 %%DATADIR%%/tests/scheduler/exp/promoted-stop.exp
 %%DATADIR%%/tests/scheduler/exp/promoted-unmanaged-monitor.exp
+%%DATADIR%%/tests/scheduler/exp/promoted-with-blocked.exp
 %%DATADIR%%/tests/scheduler/exp/promoted_monitor_restart.exp
 %%DATADIR%%/tests/scheduler/exp/quorum-1.exp
 %%DATADIR%%/tests/scheduler/exp/quorum-2.exp
@@ -1689,7 +1761,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/exp/rec-rsc-8.exp
 %%DATADIR%%/tests/scheduler/exp/rec-rsc-9.exp
 %%DATADIR%%/tests/scheduler/exp/reload-becomes-restart.exp
-%%DATADIR%%/tests/scheduler/exp/reload-versioned.exp
 %%DATADIR%%/tests/scheduler/exp/remote-connection-shutdown.exp
 %%DATADIR%%/tests/scheduler/exp/remote-connection-unrecoverable.exp
 %%DATADIR%%/tests/scheduler/exp/remote-disable.exp
@@ -1718,7 +1789,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/exp/remote-unclean2.exp
 %%DATADIR%%/tests/scheduler/exp/reprobe-target_rc.exp
 %%DATADIR%%/tests/scheduler/exp/resource-discovery.exp
-%%DATADIR%%/tests/scheduler/exp/restart-versioned.exp
+%%DATADIR%%/tests/scheduler/exp/restart-with-extra-op-params.exp
 %%DATADIR%%/tests/scheduler/exp/route-remote-notify.exp
 %%DATADIR%%/tests/scheduler/exp/rsc-defaults-2.exp
 %%DATADIR%%/tests/scheduler/exp/rsc-defaults.exp
@@ -1777,6 +1848,8 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/exp/stop-failure-no-fencing.exp
 %%DATADIR%%/tests/scheduler/exp/stop-failure-no-quorum.exp
 %%DATADIR%%/tests/scheduler/exp/stop-failure-with-fencing.exp
+%%DATADIR%%/tests/scheduler/exp/stop-unexpected-2.exp
+%%DATADIR%%/tests/scheduler/exp/stop-unexpected.exp
 %%DATADIR%%/tests/scheduler/exp/stopped-monitor-00.exp
 %%DATADIR%%/tests/scheduler/exp/stopped-monitor-01.exp
 %%DATADIR%%/tests/scheduler/exp/stopped-monitor-02.exp
@@ -1966,6 +2039,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/exp/unrunnable-2.exp
 %%DATADIR%%/tests/scheduler/exp/use-after-free-merge.exp
 %%DATADIR%%/tests/scheduler/exp/utilization-check-allowed-nodes.exp
+%%DATADIR%%/tests/scheduler/exp/utilization-complex.exp
 %%DATADIR%%/tests/scheduler/exp/utilization-order1.exp
 %%DATADIR%%/tests/scheduler/exp/utilization-order2.exp
 %%DATADIR%%/tests/scheduler/exp/utilization-order3.exp
@@ -1973,11 +2047,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/exp/utilization-shuffle.exp
 %%DATADIR%%/tests/scheduler/exp/utilization.exp
 %%DATADIR%%/tests/scheduler/exp/value-source.exp
-%%DATADIR%%/tests/scheduler/exp/versioned-operations-1.exp
-%%DATADIR%%/tests/scheduler/exp/versioned-operations-2.exp
-%%DATADIR%%/tests/scheduler/exp/versioned-operations-3.exp
-%%DATADIR%%/tests/scheduler/exp/versioned-operations-4.exp
-%%DATADIR%%/tests/scheduler/exp/versioned-resources.exp
 %%DATADIR%%/tests/scheduler/exp/whitebox-asymmetric.exp
 %%DATADIR%%/tests/scheduler/exp/whitebox-fail1.exp
 %%DATADIR%%/tests/scheduler/exp/whitebox-fail2.exp
@@ -2020,6 +2089,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/scores/994.scores
 %%DATADIR%%/tests/scheduler/scores/a-demote-then-b-migrate.scores
 %%DATADIR%%/tests/scheduler/scores/a-promote-then-b-migrate.scores
+%%DATADIR%%/tests/scheduler/scores/allow-unhealthy-nodes.scores
 %%DATADIR%%/tests/scheduler/scores/anon-instance-pending.scores
 %%DATADIR%%/tests/scheduler/scores/anti-colocation-order.scores
 %%DATADIR%%/tests/scheduler/scores/anti-colocation-promoted.scores
@@ -2110,6 +2180,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/scores/bug-rh-1097457.scores
 %%DATADIR%%/tests/scheduler/scores/bug-rh-880249.scores
 %%DATADIR%%/tests/scheduler/scores/bug-suse-707150.scores
+%%DATADIR%%/tests/scheduler/scores/bundle-connection-with-container.scores
 %%DATADIR%%/tests/scheduler/scores/bundle-nested-colocation.scores
 %%DATADIR%%/tests/scheduler/scores/bundle-order-fencing.scores
 %%DATADIR%%/tests/scheduler/scores/bundle-order-partial-start-2.scores
@@ -2133,8 +2204,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/scores/clone-anon-failcount.scores
 %%DATADIR%%/tests/scheduler/scores/clone-anon-probe-1.scores
 %%DATADIR%%/tests/scheduler/scores/clone-anon-probe-2.scores
-%%DATADIR%%/tests/scheduler/scores/clone-colocate-instance-1.scores
-%%DATADIR%%/tests/scheduler/scores/clone-colocate-instance-2.scores
 %%DATADIR%%/tests/scheduler/scores/clone-fail-block-colocation.scores
 %%DATADIR%%/tests/scheduler/scores/clone-interleave-1.scores
 %%DATADIR%%/tests/scheduler/scores/clone-interleave-2.scores
@@ -2142,7 +2211,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/scores/clone-max-zero.scores
 %%DATADIR%%/tests/scheduler/scores/clone-no-shuffle.scores
 %%DATADIR%%/tests/scheduler/scores/clone-order-16instances.scores
-%%DATADIR%%/tests/scheduler/scores/clone-order-instance.scores
 %%DATADIR%%/tests/scheduler/scores/clone-order-primitive.scores
 %%DATADIR%%/tests/scheduler/scores/clone-require-all-1.scores
 %%DATADIR%%/tests/scheduler/scores/clone-require-all-2.scores
@@ -2193,6 +2261,8 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/scores/colocated-utilization-primitive-1.scores
 %%DATADIR%%/tests/scheduler/scores/colocated-utilization-primitive-2.scores
 %%DATADIR%%/tests/scheduler/scores/colocation-influence.scores
+%%DATADIR%%/tests/scheduler/scores/colocation-priority-group.scores
+%%DATADIR%%/tests/scheduler/scores/colocation-vs-stickiness.scores
 %%DATADIR%%/tests/scheduler/scores/colocation_constraint_stops_promoted.scores
 %%DATADIR%%/tests/scheduler/scores/colocation_constraint_stops_unpromoted.scores
 %%DATADIR%%/tests/scheduler/scores/comments.scores
@@ -2213,11 +2283,16 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/scores/dc-fence-ordering.scores
 %%DATADIR%%/tests/scheduler/scores/enforce-colo1.scores
 %%DATADIR%%/tests/scheduler/scores/expire-non-blocked-failure.scores
+%%DATADIR%%/tests/scheduler/scores/expired-failed-probe-primitive.scores
 %%DATADIR%%/tests/scheduler/scores/failcount-block.scores
 %%DATADIR%%/tests/scheduler/scores/failcount.scores
 %%DATADIR%%/tests/scheduler/scores/failed-demote-recovery-promoted.scores
 %%DATADIR%%/tests/scheduler/scores/failed-demote-recovery.scores
+%%DATADIR%%/tests/scheduler/scores/failed-probe-clone.scores
+%%DATADIR%%/tests/scheduler/scores/failed-probe-primitive.scores
 %%DATADIR%%/tests/scheduler/scores/force-anon-clone-max.scores
+%%DATADIR%%/tests/scheduler/scores/group-anticolocation.scores
+%%DATADIR%%/tests/scheduler/scores/group-colocation-failure.scores
 %%DATADIR%%/tests/scheduler/scores/group-dependents.scores
 %%DATADIR%%/tests/scheduler/scores/group-fail.scores
 %%DATADIR%%/tests/scheduler/scores/group-stop-ordering.scores
@@ -2306,7 +2381,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/scores/migrate-stop.scores
 %%DATADIR%%/tests/scheduler/scores/migrate-stop_start.scores
 %%DATADIR%%/tests/scheduler/scores/migrate-success.scores
-%%DATADIR%%/tests/scheduler/scores/migrate-versioned.scores
 %%DATADIR%%/tests/scheduler/scores/migration-behind-migrating-remote.scores
 %%DATADIR%%/tests/scheduler/scores/migration-ping-pong.scores
 %%DATADIR%%/tests/scheduler/scores/minimal.scores
@@ -2397,6 +2471,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/scores/params-4.scores
 %%DATADIR%%/tests/scheduler/scores/params-5.scores
 %%DATADIR%%/tests/scheduler/scores/params-6.scores
+%%DATADIR%%/tests/scheduler/scores/partial-live-migration-multiple-active.scores
 %%DATADIR%%/tests/scheduler/scores/per-node-attrs.scores
 %%DATADIR%%/tests/scheduler/scores/per-op-failcount.scores
 %%DATADIR%%/tests/scheduler/scores/placement-capacity.scores
@@ -2410,6 +2485,8 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/scores/probe-3.scores
 %%DATADIR%%/tests/scheduler/scores/probe-4.scores
 %%DATADIR%%/tests/scheduler/scores/probe-pending-node.scores
+%%DATADIR%%/tests/scheduler/scores/probe-target-of-failed-migrate_to-1.scores
+%%DATADIR%%/tests/scheduler/scores/probe-target-of-failed-migrate_to-2.scores
 %%DATADIR%%/tests/scheduler/scores/probe-timeout.scores
 %%DATADIR%%/tests/scheduler/scores/promoted-0.scores
 %%DATADIR%%/tests/scheduler/scores/promoted-1.scores
@@ -2448,6 +2525,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/scores/promoted-score-startup.scores
 %%DATADIR%%/tests/scheduler/scores/promoted-stop.scores
 %%DATADIR%%/tests/scheduler/scores/promoted-unmanaged-monitor.scores
+%%DATADIR%%/tests/scheduler/scores/promoted-with-blocked.scores
 %%DATADIR%%/tests/scheduler/scores/promoted_monitor_restart.scores
 %%DATADIR%%/tests/scheduler/scores/quorum-1.scores
 %%DATADIR%%/tests/scheduler/scores/quorum-2.scores
@@ -2482,7 +2560,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/scores/rec-rsc-8.scores
 %%DATADIR%%/tests/scheduler/scores/rec-rsc-9.scores
 %%DATADIR%%/tests/scheduler/scores/reload-becomes-restart.scores
-%%DATADIR%%/tests/scheduler/scores/reload-versioned.scores
 %%DATADIR%%/tests/scheduler/scores/remote-connection-shutdown.scores
 %%DATADIR%%/tests/scheduler/scores/remote-connection-unrecoverable.scores
 %%DATADIR%%/tests/scheduler/scores/remote-disable.scores
@@ -2511,7 +2588,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/scores/remote-unclean2.scores
 %%DATADIR%%/tests/scheduler/scores/reprobe-target_rc.scores
 %%DATADIR%%/tests/scheduler/scores/resource-discovery.scores
-%%DATADIR%%/tests/scheduler/scores/restart-versioned.scores
+%%DATADIR%%/tests/scheduler/scores/restart-with-extra-op-params.scores
 %%DATADIR%%/tests/scheduler/scores/route-remote-notify.scores
 %%DATADIR%%/tests/scheduler/scores/rsc-defaults-2.scores
 %%DATADIR%%/tests/scheduler/scores/rsc-defaults.scores
@@ -2570,6 +2647,8 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/scores/stop-failure-no-fencing.scores
 %%DATADIR%%/tests/scheduler/scores/stop-failure-no-quorum.scores
 %%DATADIR%%/tests/scheduler/scores/stop-failure-with-fencing.scores
+%%DATADIR%%/tests/scheduler/scores/stop-unexpected-2.scores
+%%DATADIR%%/tests/scheduler/scores/stop-unexpected.scores
 %%DATADIR%%/tests/scheduler/scores/stopped-monitor-00.scores
 %%DATADIR%%/tests/scheduler/scores/stopped-monitor-01.scores
 %%DATADIR%%/tests/scheduler/scores/stopped-monitor-02.scores
@@ -2759,6 +2838,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/scores/unrunnable-2.scores
 %%DATADIR%%/tests/scheduler/scores/use-after-free-merge.scores
 %%DATADIR%%/tests/scheduler/scores/utilization-check-allowed-nodes.scores
+%%DATADIR%%/tests/scheduler/scores/utilization-complex.scores
 %%DATADIR%%/tests/scheduler/scores/utilization-order1.scores
 %%DATADIR%%/tests/scheduler/scores/utilization-order2.scores
 %%DATADIR%%/tests/scheduler/scores/utilization-order3.scores
@@ -2766,11 +2846,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/scores/utilization-shuffle.scores
 %%DATADIR%%/tests/scheduler/scores/utilization.scores
 %%DATADIR%%/tests/scheduler/scores/value-source.scores
-%%DATADIR%%/tests/scheduler/scores/versioned-operations-1.scores
-%%DATADIR%%/tests/scheduler/scores/versioned-operations-2.scores
-%%DATADIR%%/tests/scheduler/scores/versioned-operations-3.scores
-%%DATADIR%%/tests/scheduler/scores/versioned-operations-4.scores
-%%DATADIR%%/tests/scheduler/scores/versioned-resources.scores
 %%DATADIR%%/tests/scheduler/scores/whitebox-asymmetric.scores
 %%DATADIR%%/tests/scheduler/scores/whitebox-fail1.scores
 %%DATADIR%%/tests/scheduler/scores/whitebox-fail2.scores
@@ -2814,6 +2889,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/summary/994.summary
 %%DATADIR%%/tests/scheduler/summary/a-demote-then-b-migrate.summary
 %%DATADIR%%/tests/scheduler/summary/a-promote-then-b-migrate.summary
+%%DATADIR%%/tests/scheduler/summary/allow-unhealthy-nodes.summary
 %%DATADIR%%/tests/scheduler/summary/anon-instance-pending.summary
 %%DATADIR%%/tests/scheduler/summary/anti-colocation-order.summary
 %%DATADIR%%/tests/scheduler/summary/anti-colocation-promoted.summary
@@ -2904,6 +2980,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/summary/bug-rh-1097457.summary
 %%DATADIR%%/tests/scheduler/summary/bug-rh-880249.summary
 %%DATADIR%%/tests/scheduler/summary/bug-suse-707150.summary
+%%DATADIR%%/tests/scheduler/summary/bundle-connection-with-container.summary
 %%DATADIR%%/tests/scheduler/summary/bundle-nested-colocation.summary
 %%DATADIR%%/tests/scheduler/summary/bundle-order-fencing.summary
 %%DATADIR%%/tests/scheduler/summary/bundle-order-partial-start-2.summary
@@ -2927,8 +3004,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/summary/clone-anon-failcount.summary
 %%DATADIR%%/tests/scheduler/summary/clone-anon-probe-1.summary
 %%DATADIR%%/tests/scheduler/summary/clone-anon-probe-2.summary
-%%DATADIR%%/tests/scheduler/summary/clone-colocate-instance-1.summary
-%%DATADIR%%/tests/scheduler/summary/clone-colocate-instance-2.summary
 %%DATADIR%%/tests/scheduler/summary/clone-fail-block-colocation.summary
 %%DATADIR%%/tests/scheduler/summary/clone-interleave-1.summary
 %%DATADIR%%/tests/scheduler/summary/clone-interleave-2.summary
@@ -2936,7 +3011,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/summary/clone-max-zero.summary
 %%DATADIR%%/tests/scheduler/summary/clone-no-shuffle.summary
 %%DATADIR%%/tests/scheduler/summary/clone-order-16instances.summary
-%%DATADIR%%/tests/scheduler/summary/clone-order-instance.summary
 %%DATADIR%%/tests/scheduler/summary/clone-order-primitive.summary
 %%DATADIR%%/tests/scheduler/summary/clone-require-all-1.summary
 %%DATADIR%%/tests/scheduler/summary/clone-require-all-2.summary
@@ -2987,6 +3061,8 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/summary/colocated-utilization-primitive-1.summary
 %%DATADIR%%/tests/scheduler/summary/colocated-utilization-primitive-2.summary
 %%DATADIR%%/tests/scheduler/summary/colocation-influence.summary
+%%DATADIR%%/tests/scheduler/summary/colocation-priority-group.summary
+%%DATADIR%%/tests/scheduler/summary/colocation-vs-stickiness.summary
 %%DATADIR%%/tests/scheduler/summary/colocation_constraint_stops_promoted.summary
 %%DATADIR%%/tests/scheduler/summary/colocation_constraint_stops_unpromoted.summary
 %%DATADIR%%/tests/scheduler/summary/comments.summary
@@ -3007,11 +3083,16 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/summary/dc-fence-ordering.summary
 %%DATADIR%%/tests/scheduler/summary/enforce-colo1.summary
 %%DATADIR%%/tests/scheduler/summary/expire-non-blocked-failure.summary
+%%DATADIR%%/tests/scheduler/summary/expired-failed-probe-primitive.summary
 %%DATADIR%%/tests/scheduler/summary/failcount-block.summary
 %%DATADIR%%/tests/scheduler/summary/failcount.summary
 %%DATADIR%%/tests/scheduler/summary/failed-demote-recovery-promoted.summary
 %%DATADIR%%/tests/scheduler/summary/failed-demote-recovery.summary
+%%DATADIR%%/tests/scheduler/summary/failed-probe-clone.summary
+%%DATADIR%%/tests/scheduler/summary/failed-probe-primitive.summary
 %%DATADIR%%/tests/scheduler/summary/force-anon-clone-max.summary
+%%DATADIR%%/tests/scheduler/summary/group-anticolocation.summary
+%%DATADIR%%/tests/scheduler/summary/group-colocation-failure.summary
 %%DATADIR%%/tests/scheduler/summary/group-dependents.summary
 %%DATADIR%%/tests/scheduler/summary/group-fail.summary
 %%DATADIR%%/tests/scheduler/summary/group-stop-ordering.summary
@@ -3100,7 +3181,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/summary/migrate-stop.summary
 %%DATADIR%%/tests/scheduler/summary/migrate-stop_start.summary
 %%DATADIR%%/tests/scheduler/summary/migrate-success.summary
-%%DATADIR%%/tests/scheduler/summary/migrate-versioned.summary
 %%DATADIR%%/tests/scheduler/summary/migration-behind-migrating-remote.summary
 %%DATADIR%%/tests/scheduler/summary/migration-ping-pong.summary
 %%DATADIR%%/tests/scheduler/summary/minimal.summary
@@ -3191,6 +3271,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/summary/params-4.summary
 %%DATADIR%%/tests/scheduler/summary/params-5.summary
 %%DATADIR%%/tests/scheduler/summary/params-6.summary
+%%DATADIR%%/tests/scheduler/summary/partial-live-migration-multiple-active.summary
 %%DATADIR%%/tests/scheduler/summary/per-node-attrs.summary
 %%DATADIR%%/tests/scheduler/summary/per-op-failcount.summary
 %%DATADIR%%/tests/scheduler/summary/placement-capacity.summary
@@ -3204,6 +3285,8 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/summary/probe-3.summary
 %%DATADIR%%/tests/scheduler/summary/probe-4.summary
 %%DATADIR%%/tests/scheduler/summary/probe-pending-node.summary
+%%DATADIR%%/tests/scheduler/summary/probe-target-of-failed-migrate_to-1.summary
+%%DATADIR%%/tests/scheduler/summary/probe-target-of-failed-migrate_to-2.summary
 %%DATADIR%%/tests/scheduler/summary/probe-timeout.summary
 %%DATADIR%%/tests/scheduler/summary/promoted-0.summary
 %%DATADIR%%/tests/scheduler/summary/promoted-1.summary
@@ -3242,6 +3325,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/summary/promoted-score-startup.summary
 %%DATADIR%%/tests/scheduler/summary/promoted-stop.summary
 %%DATADIR%%/tests/scheduler/summary/promoted-unmanaged-monitor.summary
+%%DATADIR%%/tests/scheduler/summary/promoted-with-blocked.summary
 %%DATADIR%%/tests/scheduler/summary/promoted_monitor_restart.summary
 %%DATADIR%%/tests/scheduler/summary/quorum-1.summary
 %%DATADIR%%/tests/scheduler/summary/quorum-2.summary
@@ -3276,7 +3360,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/summary/rec-rsc-8.summary
 %%DATADIR%%/tests/scheduler/summary/rec-rsc-9.summary
 %%DATADIR%%/tests/scheduler/summary/reload-becomes-restart.summary
-%%DATADIR%%/tests/scheduler/summary/reload-versioned.summary
 %%DATADIR%%/tests/scheduler/summary/remote-connection-shutdown.summary
 %%DATADIR%%/tests/scheduler/summary/remote-connection-unrecoverable.summary
 %%DATADIR%%/tests/scheduler/summary/remote-disable.summary
@@ -3305,7 +3388,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/summary/remote-unclean2.summary
 %%DATADIR%%/tests/scheduler/summary/reprobe-target_rc.summary
 %%DATADIR%%/tests/scheduler/summary/resource-discovery.summary
-%%DATADIR%%/tests/scheduler/summary/restart-versioned.summary
+%%DATADIR%%/tests/scheduler/summary/restart-with-extra-op-params.summary
 %%DATADIR%%/tests/scheduler/summary/route-remote-notify.summary
 %%DATADIR%%/tests/scheduler/summary/rsc-defaults-2.summary
 %%DATADIR%%/tests/scheduler/summary/rsc-defaults.summary
@@ -3364,6 +3447,8 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/summary/stop-failure-no-fencing.summary
 %%DATADIR%%/tests/scheduler/summary/stop-failure-no-quorum.summary
 %%DATADIR%%/tests/scheduler/summary/stop-failure-with-fencing.summary
+%%DATADIR%%/tests/scheduler/summary/stop-unexpected-2.summary
+%%DATADIR%%/tests/scheduler/summary/stop-unexpected.summary
 %%DATADIR%%/tests/scheduler/summary/stopped-monitor-00.summary
 %%DATADIR%%/tests/scheduler/summary/stopped-monitor-01.summary
 %%DATADIR%%/tests/scheduler/summary/stopped-monitor-02.summary
@@ -3553,6 +3638,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/summary/unrunnable-2.summary
 %%DATADIR%%/tests/scheduler/summary/use-after-free-merge.summary
 %%DATADIR%%/tests/scheduler/summary/utilization-check-allowed-nodes.summary
+%%DATADIR%%/tests/scheduler/summary/utilization-complex.summary
 %%DATADIR%%/tests/scheduler/summary/utilization-order1.summary
 %%DATADIR%%/tests/scheduler/summary/utilization-order2.summary
 %%DATADIR%%/tests/scheduler/summary/utilization-order3.summary
@@ -3560,11 +3646,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/summary/utilization-shuffle.summary
 %%DATADIR%%/tests/scheduler/summary/utilization.summary
 %%DATADIR%%/tests/scheduler/summary/value-source.summary
-%%DATADIR%%/tests/scheduler/summary/versioned-operations-1.summary
-%%DATADIR%%/tests/scheduler/summary/versioned-operations-2.summary
-%%DATADIR%%/tests/scheduler/summary/versioned-operations-3.summary
-%%DATADIR%%/tests/scheduler/summary/versioned-operations-4.summary
-%%DATADIR%%/tests/scheduler/summary/versioned-resources.summary
 %%DATADIR%%/tests/scheduler/summary/whitebox-asymmetric.summary
 %%DATADIR%%/tests/scheduler/summary/whitebox-fail1.summary
 %%DATADIR%%/tests/scheduler/summary/whitebox-fail2.summary
@@ -3607,6 +3688,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/xml/994.xml
 %%DATADIR%%/tests/scheduler/xml/a-demote-then-b-migrate.xml
 %%DATADIR%%/tests/scheduler/xml/a-promote-then-b-migrate.xml
+%%DATADIR%%/tests/scheduler/xml/allow-unhealthy-nodes.xml
 %%DATADIR%%/tests/scheduler/xml/anon-instance-pending.xml
 %%DATADIR%%/tests/scheduler/xml/anti-colocation-order.xml
 %%DATADIR%%/tests/scheduler/xml/anti-colocation-promoted.xml
@@ -3697,6 +3779,7 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/xml/bug-rh-1097457.xml
 %%DATADIR%%/tests/scheduler/xml/bug-rh-880249.xml
 %%DATADIR%%/tests/scheduler/xml/bug-suse-707150.xml
+%%DATADIR%%/tests/scheduler/xml/bundle-connection-with-container.xml
 %%DATADIR%%/tests/scheduler/xml/bundle-nested-colocation.xml
 %%DATADIR%%/tests/scheduler/xml/bundle-order-fencing.xml
 %%DATADIR%%/tests/scheduler/xml/bundle-order-partial-start-2.xml
@@ -3720,8 +3803,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/xml/clone-anon-failcount.xml
 %%DATADIR%%/tests/scheduler/xml/clone-anon-probe-1.xml
 %%DATADIR%%/tests/scheduler/xml/clone-anon-probe-2.xml
-%%DATADIR%%/tests/scheduler/xml/clone-colocate-instance-1.xml
-%%DATADIR%%/tests/scheduler/xml/clone-colocate-instance-2.xml
 %%DATADIR%%/tests/scheduler/xml/clone-fail-block-colocation.xml
 %%DATADIR%%/tests/scheduler/xml/clone-interleave-1.xml
 %%DATADIR%%/tests/scheduler/xml/clone-interleave-2.xml
@@ -3729,7 +3810,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/xml/clone-max-zero.xml
 %%DATADIR%%/tests/scheduler/xml/clone-no-shuffle.xml
 %%DATADIR%%/tests/scheduler/xml/clone-order-16instances.xml
-%%DATADIR%%/tests/scheduler/xml/clone-order-instance.xml
 %%DATADIR%%/tests/scheduler/xml/clone-order-primitive.xml
 %%DATADIR%%/tests/scheduler/xml/clone-require-all-1.xml
 %%DATADIR%%/tests/scheduler/xml/clone-require-all-2.xml
@@ -3780,6 +3860,8 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/xml/colocated-utilization-primitive-1.xml
 %%DATADIR%%/tests/scheduler/xml/colocated-utilization-primitive-2.xml
 %%DATADIR%%/tests/scheduler/xml/colocation-influence.xml
+%%DATADIR%%/tests/scheduler/xml/colocation-priority-group.xml
+%%DATADIR%%/tests/scheduler/xml/colocation-vs-stickiness.xml
 %%DATADIR%%/tests/scheduler/xml/colocation_constraint_stops_promoted.xml
 %%DATADIR%%/tests/scheduler/xml/colocation_constraint_stops_unpromoted.xml
 %%DATADIR%%/tests/scheduler/xml/comments.xml
@@ -3800,11 +3882,16 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/xml/dc-fence-ordering.xml
 %%DATADIR%%/tests/scheduler/xml/enforce-colo1.xml
 %%DATADIR%%/tests/scheduler/xml/expire-non-blocked-failure.xml
+%%DATADIR%%/tests/scheduler/xml/expired-failed-probe-primitive.xml
 %%DATADIR%%/tests/scheduler/xml/failcount-block.xml
 %%DATADIR%%/tests/scheduler/xml/failcount.xml
 %%DATADIR%%/tests/scheduler/xml/failed-demote-recovery-promoted.xml
 %%DATADIR%%/tests/scheduler/xml/failed-demote-recovery.xml
+%%DATADIR%%/tests/scheduler/xml/failed-probe-clone.xml
+%%DATADIR%%/tests/scheduler/xml/failed-probe-primitive.xml
 %%DATADIR%%/tests/scheduler/xml/force-anon-clone-max.xml
+%%DATADIR%%/tests/scheduler/xml/group-anticolocation.xml
+%%DATADIR%%/tests/scheduler/xml/group-colocation-failure.xml
 %%DATADIR%%/tests/scheduler/xml/group-dependents.xml
 %%DATADIR%%/tests/scheduler/xml/group-fail.xml
 %%DATADIR%%/tests/scheduler/xml/group-stop-ordering.xml
@@ -3893,7 +3980,6 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/xml/migrate-stop.xml
 %%DATADIR%%/tests/scheduler/xml/migrate-stop_start.xml
 %%DATADIR%%/tests/scheduler/xml/migrate-success.xml
-%%DATADIR%%/tests/scheduler/xml/migrate-versioned.xml
 %%DATADIR%%/tests/scheduler/xml/migration-behind-migrating-remote.xml
*** 73 LINES SKIPPED ***