diff --git a/backport-API-libcrmcommon-add-pcmk_cib_node_shutdown.patch b/backport-API-libcrmcommon-add-pcmk_cib_node_shutdown.patch deleted file mode 100644 index ebdece9dadf681f7a72445178d31809879efad9d..0000000000000000000000000000000000000000 --- a/backport-API-libcrmcommon-add-pcmk_cib_node_shutdown.patch +++ /dev/null @@ -1,173 +0,0 @@ -From c714a2460cee17d296f9246f98b3465bc95a6dba Mon Sep 17 00:00:00 2001 -From: Ken Gaillot -Date: Tue, 13 Aug 2024 11:56:44 -0500 -Subject: [PATCH] API: libcrmcommon: add pcmk_cib_node_shutdown() - -This is intended for sbd's use, to replace its own shutdown_attr_in_cib() ---- - include/crm/common/nodes.h | 4 ++ - lib/common/nodes.c | 30 ++++++++ - lib/common/tests/nodes/Makefile.am | 5 +- - .../tests/nodes/pcmk_cib_node_shutdown_test.c | 70 +++++++++++++++++++ - 4 files changed, 107 insertions(+), 2 deletions(-) - create mode 100644 lib/common/tests/nodes/pcmk_cib_node_shutdown_test.c - -diff --git a/include/crm/common/nodes.h b/include/crm/common/nodes.h -index 5f6f25ff0c..64c574ad3c 100644 ---- a/include/crm/common/nodes.h -+++ b/include/crm/common/nodes.h -@@ -12,6 +12,7 @@ - - #include // bool - #include // gboolean, GList, GHashTable -+#include // xmlNode - - #include // pcmk_resource_t, pcmk_scheduler_t - -@@ -180,6 +181,9 @@ bool pcmk_node_is_in_maintenance(const pcmk_node_t *node); - bool pcmk_foreach_active_resource(pcmk_node_t *node, - bool (*fn)(pcmk_resource_t *, void *), - void *user_data); -+ -+const char *pcmk_cib_node_shutdown(xmlNode *cib, const char *node); -+ - /*! - * \internal - * \brief Return a string suitable for logging as a node name -diff --git a/lib/common/nodes.c b/lib/common/nodes.c -index 4edeafbc42..5228ea2618 100644 ---- a/lib/common/nodes.c -+++ b/lib/common/nodes.c -@@ -161,3 +161,33 @@ pcmk__find_node_in_list(const GList *nodes, const char *node_name) - } - return NULL; - } -+ -+#define XP_SHUTDOWN "//" PCMK__XE_NODE_STATE "[@" PCMK_XA_UNAME "='%s']/" \ -+ PCMK__XE_TRANSIENT_ATTRIBUTES "/" PCMK_XE_INSTANCE_ATTRIBUTES "/" \ -+ PCMK_XE_NVPAIR "[@" PCMK_XA_NAME "='" PCMK__NODE_ATTR_SHUTDOWN "']" -+ -+/*! -+ * \brief Get value of a node's shutdown attribute from CIB, if present -+ * -+ * \param[in] cib CIB to check -+ * \param[in] node Name of node to check -+ * -+ * \return Value of shutdown attribute for \p node in \p cib if any, -+ * otherwise NULL -+ * \note The return value is a pointer into \p cib and so is valid only for the -+ * lifetime of that object. -+ */ -+const char * -+pcmk_cib_node_shutdown(xmlNode *cib, const char *node) -+{ -+ if ((cib != NULL) && (node != NULL)) { -+ char *xpath = crm_strdup_printf(XP_SHUTDOWN, node); -+ xmlNode *match = get_xpath_object(xpath, cib, LOG_TRACE); -+ -+ free(xpath); -+ if (match != NULL) { -+ return crm_element_value(match, PCMK_XA_VALUE); -+ } -+ } -+ return NULL; -+} -diff --git a/lib/common/tests/nodes/Makefile.am b/lib/common/tests/nodes/Makefile.am -index f52c615e4d..6c4964e1d0 100644 ---- a/lib/common/tests/nodes/Makefile.am -+++ b/lib/common/tests/nodes/Makefile.am -@@ -12,12 +12,13 @@ include $(top_srcdir)/mk/unittest.mk - - # Add "_test" to the end of all test program names to simplify .gitignore. - check_PROGRAMS = pcmk__find_node_in_list_test \ -+ pcmk__xe_add_node_test \ -+ pcmk_cib_node_shutdown_test \ - pcmk_foreach_active_resource_test \ - pcmk_node_is_clean_test \ - pcmk_node_is_in_maintenance_test \ - pcmk_node_is_online_test \ - pcmk_node_is_pending_test \ -- pcmk_node_is_shutting_down_test \ -- pcmk__xe_add_node_test -+ pcmk_node_is_shutting_down_test - - TESTS = $(check_PROGRAMS) -diff --git a/lib/common/tests/nodes/pcmk_cib_node_shutdown_test.c b/lib/common/tests/nodes/pcmk_cib_node_shutdown_test.c -new file mode 100644 -index 0000000000..a64a7283e8 ---- /dev/null -+++ b/lib/common/tests/nodes/pcmk_cib_node_shutdown_test.c -@@ -0,0 +1,70 @@ -+/* -+ * Copyright 2024 the Pacemaker project contributors -+ * -+ * The version control history for this file may have further details. -+ * -+ * This source code is licensed under the GNU General Public License version 2 -+ * or later (GPLv2+) WITHOUT ANY WARRANTY. -+ */ -+ -+#include -+ -+#include // NULL -+#include // xmlNode -+ -+#include -+#include -+ -+// Minimum CIB structure needed for function's XPath search -+#define CIB_XML \ -+ "<" PCMK_XE_CIB ">" \ -+ "<" PCMK_XE_STATUS ">" \ -+ "<" PCMK__XE_NODE_STATE " " PCMK_XA_UNAME "='node1'>" \ -+ "<" PCMK__XE_TRANSIENT_ATTRIBUTES ">" \ -+ "<" PCMK_XE_INSTANCE_ATTRIBUTES ">" \ -+ "<" PCMK_XE_NVPAIR " " \ -+ PCMK_XA_NAME "='" PCMK__NODE_ATTR_SHUTDOWN "' " \ -+ PCMK_XA_VALUE "='999'/>" \ -+ "" \ -+ "" \ -+ "" \ -+ "" \ -+ "" -+ -+static void -+null_args(void **state) -+{ -+ xmlNode *xml = pcmk__xml_parse(CIB_XML); -+ -+ assert_non_null(xml); -+ assert_null(pcmk_cib_node_shutdown(NULL, NULL)); -+ assert_null(pcmk_cib_node_shutdown(xml, NULL)); -+ assert_null(pcmk_cib_node_shutdown(NULL, "node1")); -+ free_xml(xml); -+} -+ -+static void -+shutdown_absent(void **state) -+{ -+ xmlNode *xml = pcmk__xml_parse(CIB_XML); -+ -+ assert_non_null(xml); -+ assert_null(pcmk_cib_node_shutdown(xml, "node")); -+ assert_null(pcmk_cib_node_shutdown(xml, "node10")); -+ free_xml(xml); -+} -+ -+static void -+shutdown_present(void **state) -+{ -+ xmlNode *xml = pcmk__xml_parse(CIB_XML); -+ -+ assert_non_null(xml); -+ assert_string_equal(pcmk_cib_node_shutdown(xml, "node1"), "999"); -+ free_xml(xml); -+} -+ -+PCMK__UNIT_TEST(NULL, NULL, -+ cmocka_unit_test(null_args), -+ cmocka_unit_test(shutdown_absent), -+ cmocka_unit_test(shutdown_present)) --- -2.33.1.windows.1 - diff --git a/backport-API-libcrmcommon-deprecate-PCMK_VALUE_FENCE_LEGACY-d.patch b/backport-API-libcrmcommon-deprecate-PCMK_VALUE_FENCE_LEGACY-d.patch deleted file mode 100644 index 3cfaa1835178470c43fa6040c9fa331689197a82..0000000000000000000000000000000000000000 --- a/backport-API-libcrmcommon-deprecate-PCMK_VALUE_FENCE_LEGACY-d.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 61507432017a09005173771a76cb45bbf4d212e5 Mon Sep 17 00:00:00 2001 -From: Ken Gaillot -Date: Tue, 27 Aug 2024 17:43:03 -0500 -Subject: [PATCH] API: libcrmcommon: deprecate PCMK_VALUE_FENCE_LEGACY defined - constant - -Ref T279 ---- - include/crm/common/options.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/crm/common/options.h b/include/crm/common/options.h -index 64cbf5ea28..0e8730f39d 100644 ---- a/include/crm/common/options.h -+++ b/include/crm/common/options.h -@@ -220,7 +220,7 @@ extern "C" { - #define PCMK_VALUE_WRITE "write" - #define PCMK_VALUE_YELLOW "yellow" - --// @COMPAT This will become a deprecated alias for PCMK_VALUE_FENCE (see T279) -+// \deprecated Use PCMK_VALUE_FENCE instead - #define PCMK_VALUE_FENCE_LEGACY "suicide" - - --- -2.33.1.windows.1 - diff --git a/backport-Build-rpm-require-rpm-4.14.0-or-later.patch b/backport-Build-rpm-require-rpm-4.14.0-or-later.patch deleted file mode 100644 index 9fb829b9e1b944a14ed4e40e5ac81e3a96d8a8c6..0000000000000000000000000000000000000000 --- a/backport-Build-rpm-require-rpm-4.14.0-or-later.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f66e08174fff4552ba3914f12e56517a2d5663e1 Mon Sep 17 00:00:00 2001 -From: Ken Gaillot -Date: Wed, 7 Aug 2024 16:45:01 -0500 -Subject: [PATCH 016/150] Build: rpm: require rpm 4.14.0 or later - -Both RHEL 8 and SUSE 15 provide it, so we can require it for 3.0.0 ---- - INSTALL.md | 2 +- - rpm/pacemaker.spec.in | 1 - - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/INSTALL.md b/INSTALL.md -index a05e901e71..7ac85c9090 100644 ---- a/INSTALL.md -+++ b/INSTALL.md -@@ -54,7 +54,7 @@ Also: - | documentation | | python3-sphinx | python3-sphinx | python3-sphinx | - | documentation (PDF) | | latexmk texlive texlive-capt-of texlive-collection-xetex texlive-fncychap texlive-framed texlive-multirow texlive-needspace texlive-tabulary texlive-titlesec texlive-threeparttable texlive-upquote texlive-wrapfig texlive-xetex | texlive texlive-latex | texlive texlive-latex-extra | - | annotated source code as HTML via "make global" | | global | global | global | --| RPM packages via "make rpm" | 4.11 or later | rpm | rpm | (n/a) | -+| RPM packages via "make rpm" | 4.14 or later | rpm | rpm | (n/a) | - | unit tests | 1.1.0 or later | libcmocka-devel | libcmocka-devel | libcmocka-dev | - - ## Optional Testing Dependencies -diff --git a/rpm/pacemaker.spec.in b/rpm/pacemaker.spec.in -index 7367f54868..ee2142df4f 100644 ---- a/rpm/pacemaker.spec.in -+++ b/rpm/pacemaker.spec.in -@@ -597,7 +597,6 @@ make %{_smp_mflags} check - && touch .CHECKED - } 2>&1 | sed 's/[fF]ail/faiil/g' # prevent false positives in rpmlint - [ -f .CHECKED ] && rm -f -- .CHECKED --exit $? # TODO remove when rpm<4.14 compatibility irrelevant - - %install - # skip automake-native Python byte-compilation, since RPM-native one (possibly --- -2.33.1.windows.1 - diff --git a/backport-Feature-lrmd-Perform-the-TLS-handshake-asynchronousl.patch b/backport-Feature-lrmd-Perform-the-TLS-handshake-asynchronousl.patch deleted file mode 100644 index f81e05e9b8464683d9acb5e49f353159dee06beb..0000000000000000000000000000000000000000 --- a/backport-Feature-lrmd-Perform-the-TLS-handshake-asynchronousl.patch +++ /dev/null @@ -1,145 +0,0 @@ -From d9c9b3af781be0ba2bc40c177d60fc3cc7ec1459 Mon Sep 17 00:00:00 2001 -From: Chris Lumens -Date: Thu, 8 Aug 2024 13:29:35 -0400 -Subject: [PATCH] Feature: lrmd: Perform the TLS handshake asynchronously. - -It can take some time for the gnutls handshake to complete, during which -time the cluster is stuck waiting. Instead, immediately attempt the -handshake. If that fails, then start a mainloop source that will -repeatedly attempt the handshake and report results when it finishes. - -Fixes T824 ---- - lib/lrmd/lrmd_client.c | 81 ++++++++++++++++++++++++++++++++++++++---- - 1 file changed, 74 insertions(+), 7 deletions(-) - -diff --git a/lib/lrmd/lrmd_client.c b/lib/lrmd/lrmd_client.c -index cbba4f6b14..dac316fbb7 100644 ---- a/lib/lrmd/lrmd_client.c -+++ b/lib/lrmd/lrmd_client.c -@@ -100,6 +100,7 @@ typedef struct lrmd_private_s { - int expected_late_replies; - GList *pending_notify; - crm_trigger_t *process_notify; -+ crm_trigger_t *handshake_trigger; - #endif - - lrmd_event_callback callback; -@@ -626,6 +627,10 @@ lrmd_tls_connection_destroy(gpointer userdata) - g_list_free_full(native->pending_notify, lrmd_free_xml); - native->pending_notify = NULL; - } -+ if (native->handshake_trigger != NULL) { -+ mainloop_destroy_trigger(native->handshake_trigger); -+ native->handshake_trigger = NULL; -+ } - - free(native->remote->buffer); - free(native->remote->start_state); -@@ -1499,12 +1504,55 @@ add_tls_to_mainloop(lrmd_t *lrmd, bool do_handshake) - return rc; - } - -+struct handshake_data_s { -+ lrmd_t *lrmd; -+ time_t start_time; -+ int timeout_sec; -+}; -+ -+static gboolean -+try_handshake_cb(gpointer user_data) -+{ -+ struct handshake_data_s *hs = user_data; -+ lrmd_t *lrmd = hs->lrmd; -+ lrmd_private_t *native = lrmd->lrmd_private; -+ pcmk__remote_t *remote = native->remote; -+ -+ int rc = pcmk_rc_ok; -+ int tls_rc = GNUTLS_E_SUCCESS; -+ -+ if (time(NULL) >= hs->start_time + hs->timeout_sec) { -+ rc = ETIME; -+ -+ tls_handshake_failed(lrmd, GNUTLS_E_TIMEDOUT, rc); -+ free(hs); -+ return 0; -+ } -+ -+ rc = pcmk__tls_client_try_handshake(remote, &tls_rc); -+ -+ if (rc == pcmk_rc_ok) { -+ tls_handshake_succeeded(lrmd); -+ free(hs); -+ return 0; -+ } else if (rc == EAGAIN) { -+ mainloop_set_trigger(native->handshake_trigger); -+ return 1; -+ } else { -+ rc = EKEYREJECTED; -+ tls_handshake_failed(lrmd, tls_rc, rc); -+ free(hs); -+ return 0; -+ } -+} -+ - static void - lrmd_tcp_connect_cb(void *userdata, int rc, int sock) - { - lrmd_t *lrmd = userdata; - lrmd_private_t *native = lrmd->lrmd_private; - gnutls_datum_t psk_key = { NULL, 0 }; -+ int tls_rc = GNUTLS_E_SUCCESS; - - native->async_timer = 0; - -@@ -1517,9 +1565,7 @@ lrmd_tcp_connect_cb(void *userdata, int rc, int sock) - return; - } - -- /* The TCP connection was successful, so establish the TLS connection. -- * @TODO make this async to avoid blocking code in client -- */ -+ /* The TCP connection was successful, so establish the TLS connection. */ - - native->sock = sock; - -@@ -1546,11 +1592,32 @@ lrmd_tcp_connect_cb(void *userdata, int rc, int sock) - return; - } - -- if (tls_client_handshake(lrmd) != pcmk_rc_ok) { -- return; -- } -+ /* If the TLS handshake immediately succeeds or fails, we can handle that -+ * now without having to deal with mainloops and retries. Otherwise, add a -+ * trigger to keep trying until we get a result (or it times out). -+ */ -+ rc = pcmk__tls_client_try_handshake(native->remote, &tls_rc); -+ if (rc == EAGAIN) { -+ struct handshake_data_s *hs = NULL; - -- tls_handshake_succeeded(lrmd); -+ if (native->handshake_trigger != NULL) { -+ return; -+ } -+ -+ hs = pcmk__assert_alloc(1, sizeof(struct handshake_data_s)); -+ hs->lrmd = lrmd; -+ hs->start_time = time(NULL); -+ hs->timeout_sec = TLS_HANDSHAKE_TIMEOUT; -+ -+ native->handshake_trigger = mainloop_add_trigger(G_PRIORITY_LOW, try_handshake_cb, hs); -+ mainloop_set_trigger(native->handshake_trigger); -+ -+ } else if (rc == pcmk_rc_ok) { -+ tls_handshake_succeeded(lrmd); -+ -+ } else { -+ tls_handshake_failed(lrmd, tls_rc, rc); -+ } - } - - static int --- -2.33.1.windows.1 - diff --git a/backport-Feature-python-Add-a-python-wrapper-for-crm_exit_str.patch b/backport-Feature-python-Add-a-python-wrapper-for-crm_exit_str.patch deleted file mode 100644 index bae9b60191b5c2a3c0a7d20a744ffdb9151e0950..0000000000000000000000000000000000000000 --- a/backport-Feature-python-Add-a-python-wrapper-for-crm_exit_str.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 8dbd0816c84b075b02e21f733376343ec60290a6 Mon Sep 17 00:00:00 2001 -From: Chris Lumens -Date: Mon, 3 Jun 2024 09:28:06 -0400 -Subject: [PATCH 022/150] Feature: python: Add a python wrapper for - crm_exit_str. - -We also need a new function to find libcrmcommon.so (and potentially, -other libraries in the future) in case we are running from the source -tree instead of on an installed system. This allows anything that -imports pacemaker.exitstatus to still function. ---- - python/pacemaker/Makefile.am | 3 ++- - python/pacemaker/_library.py | 38 ++++++++++++++++++++++++++++++++++ - python/pacemaker/exitstatus.py | 6 ++++++ - 3 files changed, 46 insertions(+), 1 deletion(-) - create mode 100644 python/pacemaker/_library.py - -diff --git a/python/pacemaker/Makefile.am b/python/pacemaker/Makefile.am -index df9cc46eef..99a137ad78 100644 ---- a/python/pacemaker/Makefile.am -+++ b/python/pacemaker/Makefile.am -@@ -1,5 +1,5 @@ - # --# Copyright 2023 the Pacemaker project contributors -+# Copyright 2023-2024 the Pacemaker project contributors - # - # The version control history for this file may have further details. - # -@@ -10,6 +10,7 @@ - MAINTAINERCLEANFILES = Makefile.in - - pkgpython_PYTHON = __init__.py \ -+ _library.py \ - exitstatus.py - - nodist_pkgpython_PYTHON = buildoptions.py -diff --git a/python/pacemaker/_library.py b/python/pacemaker/_library.py -new file mode 100644 -index 0000000000..cd6bc4ef44 ---- /dev/null -+++ b/python/pacemaker/_library.py -@@ -0,0 +1,38 @@ -+"""A module providing private library management code.""" -+ -+__all__ = ["_libcrmcommon"] -+__copyright__ = "Copyright 2024 the Pacemaker project contributors" -+__license__ = "GNU Lesser General Public License version 2.1 or later (LGPLv2.1+)" -+ -+import ctypes -+from ctypes.util import find_library -+from glob import glob -+import os -+ -+from pacemaker.buildoptions import BuildOptions -+ -+ -+def load_library(basename): -+ """Find and load the library with the given base name.""" -+ path = find_library(basename) -+ -+ # If the library was not found anywhere in the default locations, also search -+ # for it in the build directory -+ if path is None: -+ # pylint: disable=protected-access -+ for d in glob("%s/lib/*/.libs" % BuildOptions._BUILD_DIR): -+ path = "%s/lib%s.so" % (d, basename) -+ -+ if os.path.exists(path): -+ break -+ -+ path = None -+ -+ if path is None: -+ raise FileNotFoundError(basename) -+ -+ return ctypes.cdll.LoadLibrary(path) -+ -+ -+_libcrmcommon = load_library("crmcommon") -+_libcrmcommon.crm_exit_str.restype = ctypes.c_char_p -diff --git a/python/pacemaker/exitstatus.py b/python/pacemaker/exitstatus.py -index 7294d518e7..03f7d2c8e2 100644 ---- a/python/pacemaker/exitstatus.py -+++ b/python/pacemaker/exitstatus.py -@@ -6,6 +6,8 @@ __license__ = "GNU Lesser General Public License version 2.1 or later (LGPLv2.1+ - - from enum import IntEnum, unique - -+from pacemaker._library import _libcrmcommon -+ - - # These values must be kept in sync with include/crm/common/results.h - @unique -@@ -60,3 +62,7 @@ class ExitStatus(IntEnum): - DEGRADED_PROMOTED = 191 - NONE = 193 - MAX = 255 -+ -+ def __str__(self): -+ """Given an ExitStatus, return the matching error string.""" -+ return _libcrmcommon.crm_exit_str(self.value).decode() --- -2.33.1.windows.1 - diff --git a/backport-Fix-libcrmcommon-Detect-newly-created-alerts-section.patch b/backport-Fix-libcrmcommon-Detect-newly-created-alerts-section.patch deleted file mode 100644 index c37a8dca5f768b3b9da73ee45121733dd41078c2..0000000000000000000000000000000000000000 --- a/backport-Fix-libcrmcommon-Detect-newly-created-alerts-section.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 562745575a4d8dc00c239e674714856c51cac6ef Mon Sep 17 00:00:00 2001 -From: Reid Wahl -Date: Wed, 28 Aug 2024 19:12:20 -0700 -Subject: [PATCH] Fix: libcrmcommon: Detect newly created alerts section - -This fixes a regression introduced by 20ad1a9. - -If the CIB does not already contain an alerts element, creating a new -alert requires creating the alerts element. This is included in the -patchset as a create operation. (Adding a new alert to an existing -alerts element is a modify operation.) - -Prior to this commit, we were checking whether cib_op="create". We -should be checking whether operation="create". - -As a result, if a new alert was created in a CIB that did not previously -contain an alerts element, the controller would not detect the change -and would not process the new alert. - -Fixes T865 -Fixes RHEL-55458 - -Signed-off-by: Reid Wahl ---- - lib/cib/cib_utils.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/cib/cib_utils.c b/lib/cib/cib_utils.c -index f868f11397..d4b8120fbc 100644 ---- a/lib/cib/cib_utils.c -+++ b/lib/cib/cib_utils.c -@@ -160,7 +160,7 @@ element_in_patchset_v2(const xmlNode *patchset, const char *element) - NULL, NULL); - change != NULL; change = pcmk__xe_next_same(change)) { - -- const char *op = crm_element_value(change, PCMK__XA_CIB_OP); -+ const char *op = crm_element_value(change, PCMK_XA_OPERATION); - const char *diff_xpath = crm_element_value(change, PCMK_XA_PATH); - - if (pcmk__str_eq(diff_xpath, element_regex, pcmk__str_regex)) { --- -2.33.1.windows.1 - diff --git a/backport-Log-fencer-update-terminology-in-trace-message.patch b/backport-Log-fencer-update-terminology-in-trace-message.patch deleted file mode 100644 index 930168e7c0498eb0b19a950ee9807fd0ae83ed3c..0000000000000000000000000000000000000000 --- a/backport-Log-fencer-update-terminology-in-trace-message.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 25034bbe3413e440afe59476c21e2fd1de001c1d Mon Sep 17 00:00:00 2001 -From: Ken Gaillot -Date: Tue, 27 Aug 2024 16:43:39 -0500 -Subject: [PATCH] Log: fencer: update terminology in trace message - -... and comments - -Ref T279 ---- - daemons/fenced/fenced_remote.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/daemons/fenced/fenced_remote.c b/daemons/fenced/fenced_remote.c -index 653c2e697b..7d54e3b2be 100644 ---- a/daemons/fenced/fenced_remote.c -+++ b/daemons/fenced/fenced_remote.c -@@ -1034,7 +1034,7 @@ merge_duplicates(remote_fencing_op_t *op) - continue; - } - if (pcmk__str_eq(other->target, other->originator, pcmk__str_casei)) { -- crm_trace("%.8s not duplicate of %.8s: suicide for %s", -+ crm_trace("%.8s not duplicate of %.8s: self-fencing for %s", - op->id, other->id, other->target); - continue; - } -@@ -1983,10 +1983,10 @@ request_peer_fencing(remote_fencing_op_t *op, peer_device_info_t *peer) - come back in between - - Delicate might be the case where we have watchdog-fencing - enabled for a node but the watchdog-fencing-device isn't -- explicitly chosen for suicide. Local pe-execution in sbd -- may detect the node as unclean and lead to timely suicide. -- Otherwise the selection of PCMK_OPT_STONITH_WATCHDOG_TIMEOUT -- at least is questionable. -+ explicitly chosen for self-fencing. Local scheduler execution -+ in sbd might detect the node as unclean and lead to timely -+ self-fencing. Otherwise the selection of -+ PCMK_OPT_STONITH_WATCHDOG_TIMEOUT at least is questionable. - */ - - /* coming here we're not waiting for watchdog timeout - --- -2.33.1.windows.1 - diff --git a/backport-Log-pacemaker-based-client-name-can-be-NULL.patch b/backport-Log-pacemaker-based-client-name-can-be-NULL.patch deleted file mode 100644 index 10f315bbfd6e965633acbd4b1f0aaec97f46ebff..0000000000000000000000000000000000000000 --- a/backport-Log-pacemaker-based-client-name-can-be-NULL.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 78e350275174883f64ca36ffd0523735a3ece2b2 Mon Sep 17 00:00:00 2001 -From: Ken Gaillot -Date: Tue, 30 Jul 2024 17:27:14 -0500 -Subject: [PATCH] Log: pacemaker-based: client name can be NULL - ---- - daemons/based/based_callbacks.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/daemons/based/based_callbacks.c b/daemons/based/based_callbacks.c -index 8925d007c4..1390423c32 100644 ---- a/daemons/based/based_callbacks.c -+++ b/daemons/based/based_callbacks.c -@@ -1083,10 +1083,12 @@ cib_process_request(xmlNode *request, gboolean privileged, - - if (cib_client == NULL) { - crm_trace("Processing peer %s operation from %s/%s on %s intended for %s (reply=%s)", -- op, client_name, call_id, originator, target, reply_to); -+ op, pcmk__s(client_name, "client"), call_id, originator, -+ target, reply_to); - } else { - crm_xml_add(request, PCMK__XA_SRC, OUR_NODENAME); -- crm_trace("Processing local %s operation from %s/%s intended for %s", op, client_name, call_id, target); -+ crm_trace("Processing local %s operation from %s/%s intended for %s", -+ op, pcmk__s(client_name, "client"), call_id, target); - } - - rc = cib__get_operation(op, &operation); -@@ -1194,7 +1196,8 @@ cib_process_request(xmlNode *request, gboolean privileged, - do_crm_log(level, - "Completed %s operation for section %s: %s (rc=%d, origin=%s/%s/%s, version=%s.%s.%s)", - op, section ? section : "'all'", pcmk_strerror(rc), rc, -- originator ? originator : "local", client_name, call_id, -+ originator ? originator : "local", -+ pcmk__s(client_name, "client"), call_id, - pcmk__s(admin_epoch_s, "0"), - pcmk__s(epoch_s, "0"), - pcmk__s(num_updates_s, "0")); -@@ -1215,7 +1218,8 @@ cib_process_request(xmlNode *request, gboolean privileged, - - if (is_update && !cib_legacy_mode()) { - crm_trace("Completed pre-sync update from %s/%s/%s%s", -- originator ? originator : "local", client_name, call_id, -+ originator ? originator : "local", -+ pcmk__s(client_name, "client"), call_id, - local_notify?" with local notification":""); - - } else if (!needs_reply || stand_alone) { --- -2.25.1 - diff --git a/backport-Log-various-ensure-there-are-spaces-around-CRM_XS.patch b/backport-Log-various-ensure-there-are-spaces-around-CRM_XS.patch deleted file mode 100644 index 34ca0077d4db5d9ad6bc9d1caca718f5d93cc4b0..0000000000000000000000000000000000000000 --- a/backport-Log-various-ensure-there-are-spaces-around-CRM_XS.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 1246f8d355d8e53956b6d2dc1e134b04756f5396 Mon Sep 17 00:00:00 2001 -From: Ken Gaillot -Date: Tue, 30 Jul 2024 17:07:14 -0500 -Subject: [PATCH] Log: various: ensure there are spaces around CRM_XS - ---- - daemons/fenced/fenced_remote.c | 4 ++-- - lib/cluster/membership.c | 2 +- - lib/common/mainloop.c | 2 +- - lib/fencing/st_rhcs.c | 4 ++-- - lib/pacemaker/pcmk_sched_resource.c | 2 +- - 5 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/daemons/fenced/fenced_remote.c b/daemons/fenced/fenced_remote.c -index 0146cd1ddf..653c2e697b 100644 ---- a/daemons/fenced/fenced_remote.c -+++ b/daemons/fenced/fenced_remote.c -@@ -1896,8 +1896,8 @@ request_peer_fencing(remote_fencing_op_t *op, peer_device_info_t *peer) - op->total_timeout = TIMEOUT_MULTIPLY_FACTOR * get_op_total_timeout(op, peer); - op->op_timer_total = g_timeout_add(1000 * op->total_timeout, remote_op_timeout, op); - report_timeout_period(op, op->total_timeout); -- crm_info("Total timeout set to %ds for peer's fencing targeting %s for %s" -- CRM_XS "id=%.8s", -+ crm_info("Total timeout set to %ds for peer's fencing targeting %s for %s " -+ CRM_XS " id=%.8s", - op->total_timeout, op->target, op->client_name, op->id); - } - -diff --git a/lib/cluster/membership.c b/lib/cluster/membership.c -index 7eedc2ef38..b248853cd2 100644 ---- a/lib/cluster/membership.c -+++ b/lib/cluster/membership.c -@@ -1203,7 +1203,7 @@ update_peer_state_iter(const char *source, crm_node_t *node, const char *state, - gboolean is_member; - - CRM_CHECK(node != NULL, -- crm_err("Could not set state for unknown host to %s" -+ crm_err("Could not set state for unknown host to %s " - CRM_XS " source=%s", state, source); - return NULL); - -diff --git a/lib/common/mainloop.c b/lib/common/mainloop.c -index 76261342dd..d44d691e5c 100644 ---- a/lib/common/mainloop.c -+++ b/lib/common/mainloop.c -@@ -758,7 +758,7 @@ mainloop_gio_callback(GIOChannel *gio, GIOCondition condition, gpointer data) - } - - if (client->ipc && !crm_ipc_connected(client->ipc)) { -- crm_err("Connection to %s closed " CRM_XS "client=%p condition=%d", -+ crm_err("Connection to %s closed " CRM_XS " client=%p condition=%d", - client->name, client, condition); - rc = G_SOURCE_REMOVE; - -diff --git a/lib/fencing/st_rhcs.c b/lib/fencing/st_rhcs.c -index d104fe804f..ebf3399bf6 100644 ---- a/lib/fencing/st_rhcs.c -+++ b/lib/fencing/st_rhcs.c -@@ -60,8 +60,8 @@ stonith__list_rhcs_agents(stonith_key_value_t **devices) - #else - if (dirfd == -1) { - if (i == 0) { -- crm_notice("Problem with listing %s directory" -- CRM_XS "errno=%d", RH_STONITH_PREFIX, errno); -+ crm_notice("Problem with listing %s directory " -+ CRM_XS " errno=%d", RH_STONITH_PREFIX, errno); - } - free(namelist[i]); - continue; -diff --git a/lib/pacemaker/pcmk_sched_resource.c b/lib/pacemaker/pcmk_sched_resource.c -index 0791994f8f..4bbfa9501b 100644 ---- a/lib/pacemaker/pcmk_sched_resource.c -+++ b/lib/pacemaker/pcmk_sched_resource.c -@@ -601,7 +601,7 @@ pcmk__threshold_reached(pcmk_resource_t *rsc, const pcmk_node_t *node, - - if (remaining_tries <= 0) { - pcmk__sched_warn("%s cannot run on %s due to reaching migration " -- "threshold (clean up resource to allow again)" -+ "threshold (clean up resource to allow again) " - CRM_XS " failures=%d " - PCMK_META_MIGRATION_THRESHOLD "=%d", - rsc_to_ban->id, pcmk__node_name(node), fail_count, --- -2.33.1.windows.1 - diff --git a/backport-Low-controller-libpacemaker-transition-graph-IDs-sho.patch b/backport-Low-controller-libpacemaker-transition-graph-IDs-sho.patch deleted file mode 100644 index b06602edf3f938a4564e2cb5e33fe0094b08fc39..0000000000000000000000000000000000000000 --- a/backport-Low-controller-libpacemaker-transition-graph-IDs-sho.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 74041dd735a8620890861132cdc33bc9921a4e73 Mon Sep 17 00:00:00 2001 -From: Ken Gaillot -Date: Tue, 30 Jul 2024 11:56:15 -0500 -Subject: [PATCH] Low: controller,libpacemaker: transition graph IDs should be - positive - -Previously, -1 was used to indicate an empty graph (an allocated graph object -not parsed from XML), and 0 was the first actual graph ID. However that led to -awkward log messages referring to "Transition -1" and "Transition 0". - -Now, use 0 to indicate an empty graph, and 1 as the first actual ID. This still -leaves "Transition 0" for empty graphs (such as aborting a transition before -any transition has happened), but that can be addressed separately. ---- - daemons/controld/controld_callbacks.c | 2 +- - lib/pacemaker/pcmk_graph_consumer.c | 6 +----- - lib/pacemaker/pcmk_graph_producer.c | 2 +- - 3 files changed, 3 insertions(+), 7 deletions(-) - -diff --git a/daemons/controld/controld_callbacks.c b/daemons/controld/controld_callbacks.c -index 16e64242f7..5140b59a53 100644 ---- a/daemons/controld/controld_callbacks.c -+++ b/daemons/controld/controld_callbacks.c -@@ -310,7 +310,7 @@ peer_update_callback(enum crm_status_type type, crm_node_t * node, const void *d - - } else if (appeared == FALSE) { - if ((controld_globals.transition_graph == NULL) -- || (controld_globals.transition_graph->id == -1)) { -+ || (controld_globals.transition_graph->id <= 0)) { - crm_info("Stonith/shutdown of node %s is unknown to the " - "current DC", node->uname); - } else { -diff --git a/lib/pacemaker/pcmk_graph_consumer.c b/lib/pacemaker/pcmk_graph_consumer.c -index 6f1943a41b..e1449bac33 100644 ---- a/lib/pacemaker/pcmk_graph_consumer.c -+++ b/lib/pacemaker/pcmk_graph_consumer.c -@@ -754,10 +754,6 @@ pcmk__unpack_graph(const xmlNode *xml_graph, const char *reference) - return NULL; - } - -- new_graph->id = -1; -- new_graph->abort_priority = 0; -- new_graph->network_delay = 0; -- new_graph->stonith_timeout = 0; - new_graph->completion_action = pcmk__graph_done; - - // Parse top-level attributes from PCMK__XE_TRANSITION_GRAPH -@@ -766,7 +762,7 @@ pcmk__unpack_graph(const xmlNode *xml_graph, const char *reference) - - CRM_CHECK(buf != NULL, - pcmk__free_graph(new_graph); return NULL); -- pcmk__scan_min_int(buf, &(new_graph->id), -1); -+ pcmk__scan_min_int(buf, &(new_graph->id), 1); - - buf = crm_element_value(xml_graph, PCMK_OPT_CLUSTER_DELAY); - CRM_CHECK(buf != NULL, -diff --git a/lib/pacemaker/pcmk_graph_producer.c b/lib/pacemaker/pcmk_graph_producer.c -index 286a518566..f3fbd666d0 100644 ---- a/lib/pacemaker/pcmk_graph_producer.c -+++ b/lib/pacemaker/pcmk_graph_producer.c -@@ -932,7 +932,7 @@ add_action_to_graph(gpointer data, gpointer user_data) - } - } - --static int transition_id = -1; -+static int transition_id = 0; - - /*! - * \internal --- -2.33.1.windows.1 - diff --git a/backport-Low-libcib-improve-error-handling-in-cib_file_new.patch b/backport-Low-libcib-improve-error-handling-in-cib_file_new.patch deleted file mode 100644 index 9a661a26eb2d23f009f1ac449799435be8e2878a..0000000000000000000000000000000000000000 --- a/backport-Low-libcib-improve-error-handling-in-cib_file_new.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 2e5470541473af37f22c489cb87fe473c7ef85f3 Mon Sep 17 00:00:00 2001 -From: Ken Gaillot -Date: Mon, 26 Aug 2024 18:03:40 -0500 -Subject: [PATCH] Low: libcib: improve error handling in cib_file_new() - -Move argument validation to top so we don't leak memory on failure, -and check strdup() for failure. ---- - lib/cib/cib_file.c | 26 +++++++++++++++++++------- - 1 file changed, 19 insertions(+), 7 deletions(-) - -diff --git a/lib/cib/cib_file.c b/lib/cib/cib_file.c -index 24bd029406..9bb076743e 100644 ---- a/lib/cib/cib_file.c -+++ b/lib/cib/cib_file.c -@@ -647,34 +647,46 @@ cib_file_client_id(const cib_t *cib, const char **async_id, - cib_t * - cib_file_new(const char *cib_location) - { -+ cib_t *cib = NULL; - cib_file_opaque_t *private = NULL; -- cib_t *cib = cib_new_variant(); -+ char *filename = NULL; -+ -+ if (cib_location == NULL) { -+ cib_location = getenv("CIB_file"); -+ if (cib_location == NULL) { -+ return NULL; // Shouldn't be possible if we were called internally -+ } -+ } - -+ cib = cib_new_variant(); - if (cib == NULL) { - return NULL; - } - -- private = calloc(1, sizeof(cib_file_opaque_t)); -+ filename = strdup(cib_location); -+ if (filename == NULL) { -+ free(cib); -+ return NULL; -+ } - -+ private = calloc(1, sizeof(cib_file_opaque_t)); - if (private == NULL) { - free(cib); -+ free(filename); - return NULL; - } -+ - private->id = crm_generate_uuid(); -+ private->filename = filename; - - cib->variant = cib_file; - cib->variant_opaque = private; - -- if (cib_location == NULL) { -- cib_location = getenv("CIB_file"); -- CRM_CHECK(cib_location != NULL, return NULL); // Shouldn't be possible -- } - private->flags = 0; - if (cib_file_is_live(cib_location)) { - cib_set_file_flags(private, cib_file_flag_live); - crm_trace("File %s detected as live CIB", cib_location); - } -- private->filename = strdup(cib_location); - - /* assign variant specific ops */ - cib->delegate_fn = cib_file_perform_op_delegate; --- -2.33.1.windows.1 - diff --git a/backport-Low-lrmd-Report-connection-failures-in-tls_handshake.patch b/backport-Low-lrmd-Report-connection-failures-in-tls_handshake.patch deleted file mode 100644 index ca5815c0b6e5a0f02b6bbb94821e47a59a0e5142..0000000000000000000000000000000000000000 --- a/backport-Low-lrmd-Report-connection-failures-in-tls_handshake.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 5d97a82227e19f7f567ab3a16264dc0162cd0cf7 Mon Sep 17 00:00:00 2001 -From: Chris Lumens -Date: Wed, 14 Aug 2024 10:01:51 -0400 -Subject: [PATCH] Low: lrmd: Report connection failures in - tls_handshake_failed. - -This means we can also get rid of a couple calls to -report_async_connection_result that are no longer necessary because this -patch would cause duplicate calls. ---- - lib/lrmd/lrmd_client.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/lib/lrmd/lrmd_client.c b/lib/lrmd/lrmd_client.c -index ee0daae9b4..cbba4f6b14 100644 ---- a/lib/lrmd/lrmd_client.c -+++ b/lib/lrmd/lrmd_client.c -@@ -1399,6 +1399,8 @@ tls_handshake_failed(lrmd_t *lrmd, int tls_rc, int rc) - "Pacemaker Remote server %s:%d failed: %s", - native->server, native->port, - (rc == EPROTO)? gnutls_strerror(tls_rc) : pcmk_rc_str(rc)); -+ report_async_connection_result(lrmd, pcmk_rc2legacy(rc)); -+ - gnutls_deinit(*native->remote->tls_session); - gnutls_free(native->remote->tls_session); - native->remote->tls_session = NULL; -@@ -1545,7 +1547,6 @@ lrmd_tcp_connect_cb(void *userdata, int rc, int sock) - } - - if (tls_client_handshake(lrmd) != pcmk_rc_ok) { -- report_async_connection_result(lrmd, -EKEYREJECTED); - return; - } - -@@ -1676,10 +1677,6 @@ lrmd_api_connect_async(lrmd_t * lrmd, const char *name, int timeout) - #ifdef HAVE_GNUTLS_GNUTLS_H - case pcmk__client_tls: - rc = lrmd_tls_connect_async(lrmd, timeout); -- if (rc) { -- /* connection failed, report rc now */ -- report_async_connection_result(lrmd, rc); -- } - break; - #endif - default: --- -2.33.1.windows.1 - diff --git a/backport-Low-schemas-Add-additional-node-types-to-the-crmadmi.patch b/backport-Low-schemas-Add-additional-node-types-to-the-crmadmi.patch deleted file mode 100644 index 1a36e9d3bd22cd42367a58e8d2a0ad86647ba363..0000000000000000000000000000000000000000 --- a/backport-Low-schemas-Add-additional-node-types-to-the-crmadmi.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 2169d226538a75cdc1a8107bcd86499b21303fd7 Mon Sep 17 00:00:00 2001 -From: Chris Lumens -Date: Tue, 13 Aug 2024 10:58:23 -0400 -Subject: [PATCH 017/150] Low: schemas: Add additional node types to the - crmadmin schema. - -I think these always should have been present as options in the schema. -Without them, crmadmin output does not validate. ---- - xml/api/crmadmin-2.25.rng | 2 ++ - xml/api/crmadmin-2.4.rng | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/xml/api/crmadmin-2.25.rng b/xml/api/crmadmin-2.25.rng -index 973f6d4935..1400a2ceb7 100644 ---- a/xml/api/crmadmin-2.25.rng -+++ b/xml/api/crmadmin-2.25.rng -@@ -51,6 +51,8 @@ - member - remote - ping -+ cluster -+ guest - - - -diff --git a/xml/api/crmadmin-2.4.rng b/xml/api/crmadmin-2.4.rng -index 34c9ca4307..3866d97dc5 100644 ---- a/xml/api/crmadmin-2.4.rng -+++ b/xml/api/crmadmin-2.4.rng -@@ -58,6 +58,8 @@ - member - remote - ping -+ cluster -+ guest - - - --- -2.33.1.windows.1 - diff --git a/backport-Low-tools-handle-orphans-when-outputting-node-histor.patch b/backport-Low-tools-handle-orphans-when-outputting-node-histor.patch deleted file mode 100644 index a49a141867eba8bb1b9df4f1bc1042eb80aeecb8..0000000000000000000000000000000000000000 --- a/backport-Low-tools-handle-orphans-when-outputting-node-histor.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c36adbe6ec961d87b32cb90fe417e4d4911d41d9 Mon Sep 17 00:00:00 2001 -From: Ken Gaillot -Date: Tue, 20 Aug 2024 15:20:53 -0500 -Subject: [PATCH] Low: tools: handle orphans when outputting node history in - crm_mon - ---- - lib/pengine/pe_output.c | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/lib/pengine/pe_output.c b/lib/pengine/pe_output.c -index 7792983e0a..f4c7424392 100644 ---- a/lib/pengine/pe_output.c -+++ b/lib/pengine/pe_output.c -@@ -2449,8 +2449,17 @@ node_history_list(pcmk__output_t *out, va_list args) { - rsc_entry != NULL; rsc_entry = pcmk__xe_next_same(rsc_entry)) { - - const char *rsc_id = crm_element_value(rsc_entry, PCMK_XA_ID); -- pcmk_resource_t *rsc = pe_find_resource(scheduler->resources, rsc_id); -- const pcmk_resource_t *parent = pe__const_top_resource(rsc, false); -+ pcmk_resource_t *rsc = NULL; -+ const pcmk_resource_t *parent = NULL; -+ -+ if (rsc_id == NULL) { -+ continue; // Malformed entry -+ } -+ -+ rsc = pe_find_resource(scheduler->resources, rsc_id); -+ if (rsc == NULL) { -+ continue; // Resource was removed from configuration -+ } - - /* We can't use is_filtered here to filter group resources. For is_filtered, - * we have to decide whether to check the parent or not. If we check the -@@ -2460,6 +2469,7 @@ node_history_list(pcmk__output_t *out, va_list args) { - * - * For other resource types, is_filtered is okay. - */ -+ parent = pe__const_top_resource(rsc, false); - if (pcmk__is_group(parent)) { - if (!pcmk__str_in_list(rsc_printable_id(rsc), only_rsc, - pcmk__str_star_matches) --- -2.33.1.windows.1 - diff --git a/backport-Refactor-fencer-rename-variables-for-terminology-cha.patch b/backport-Refactor-fencer-rename-variables-for-terminology-cha.patch deleted file mode 100644 index 28b16f67dba4feb32ca033b72f37d1bccf537b85..0000000000000000000000000000000000000000 --- a/backport-Refactor-fencer-rename-variables-for-terminology-cha.patch +++ /dev/null @@ -1,121 +0,0 @@ -From f0c513adf5b89b20b15ef2ea22f4f6c8d9b6e767 Mon Sep 17 00:00:00 2001 -From: Ken Gaillot -Date: Tue, 27 Aug 2024 16:41:33 -0500 -Subject: [PATCH] Refactor: fencer: rename variables for terminology change - -Ref T279 ---- - daemons/fenced/fenced_commands.c | 30 ++++++++++++++++-------------- - 1 file changed, 16 insertions(+), 14 deletions(-) - -diff --git a/daemons/fenced/fenced_commands.c b/daemons/fenced/fenced_commands.c -index dc8ace77b7..63110fbc83 100644 ---- a/daemons/fenced/fenced_commands.c -+++ b/daemons/fenced/fenced_commands.c -@@ -52,7 +52,7 @@ struct device_search_s { - /* number of device replies received so far */ - int replies_received; - /* whether the target is eligible to perform requested action (or off) */ -- bool allow_suicide; -+ bool allow_self; - - /* private data to pass to search callback function */ - void *user_data; -@@ -2057,13 +2057,13 @@ search_devices_record_result(struct device_search_s *search, const char *device, - * \param[in] device Fence device to check - * \param[in] action Fence action to check - * \param[in] target Hostname of fence target -- * \param[in] allow_suicide Whether self-fencing is allowed for this operation -+ * \param[in] allow_self Whether self-fencing is allowed for this operation - * - * \return TRUE if local host is allowed to execute action, FALSE otherwise - */ - static gboolean - localhost_is_eligible(const stonith_device_t *device, const char *action, -- const char *target, gboolean allow_suicide) -+ const char *target, gboolean allow_self) - { - gboolean localhost_is_target = pcmk__str_eq(target, stonith_our_uname, - pcmk__str_casei); -@@ -2079,7 +2079,7 @@ localhost_is_eligible(const stonith_device_t *device, const char *action, - return FALSE; - } - -- } else if (localhost_is_target && !allow_suicide) { -+ } else if (localhost_is_target && !allow_self) { - crm_trace("'%s' operation does not support self-fencing", action); - return FALSE; - } -@@ -2158,7 +2158,7 @@ can_fence_host_with_device(stonith_device_t *dev, - goto search_report_results; - - } else if (!localhost_is_eligible_with_remap(dev, action, target, -- search->allow_suicide)) { -+ search->allow_self)) { - check_type = "This node is not allowed to execute action"; - goto search_report_results; - } -@@ -2250,8 +2250,10 @@ search_devices(gpointer key, gpointer value, gpointer user_data) - - #define DEFAULT_QUERY_TIMEOUT 20 - static void --get_capable_devices(const char *host, const char *action, int timeout, bool suicide, void *user_data, -- void (*callback) (GList * devices, void *user_data), uint32_t support_action_only) -+get_capable_devices(const char *host, const char *action, int timeout, -+ bool allow_self, void *user_data, -+ void (*callback) (GList * devices, void *user_data), -+ uint32_t support_action_only) - { - struct device_search_s *search; - guint ndevices = g_hash_table_size(device_list); -@@ -2266,7 +2268,7 @@ get_capable_devices(const char *host, const char *action, int timeout, bool suic - search->host = pcmk__str_copy(host); - search->action = pcmk__str_copy(action); - search->per_device_timeout = timeout; -- search->allow_suicide = suicide; -+ search->allow_self = allow_self; - search->callback = callback; - search->user_data = user_data; - search->support_action_only = support_action_only; -@@ -2360,13 +2362,13 @@ add_action_specific_attributes(xmlNode *xml, const char *action, - * \param[in] action Fence action - * \param[in] device Fence device - * \param[in] target Fence target -- * \param[in] allow_suicide Whether self-fencing is allowed -+ * \param[in] allow_self Whether self-fencing is allowed - */ - static void - add_disallowed(xmlNode *xml, const char *action, const stonith_device_t *device, -- const char *target, gboolean allow_suicide) -+ const char *target, gboolean allow_self) - { -- if (!localhost_is_eligible(device, action, target, allow_suicide)) { -+ if (!localhost_is_eligible(device, action, target, allow_self)) { - crm_trace("Action '%s' using %s is disallowed for local host", - action, device->id); - pcmk__xe_set_bool_attr(xml, PCMK__XA_ST_ACTION_DISALLOWED, true); -@@ -2381,18 +2383,18 @@ add_disallowed(xmlNode *xml, const char *action, const stonith_device_t *device, - * \param[in] action Fence action - * \param[in] device Fence device - * \param[in] target Fence target -- * \param[in] allow_suicide Whether self-fencing is allowed -+ * \param[in] allow_self Whether self-fencing is allowed - */ - static void - add_action_reply(xmlNode *xml, const char *action, - const stonith_device_t *device, const char *target, -- gboolean allow_suicide) -+ gboolean allow_self) - { - xmlNode *child = pcmk__xe_create(xml, PCMK__XE_ST_DEVICE_ACTION); - - crm_xml_add(child, PCMK_XA_ID, action); - add_action_specific_attributes(child, action, device, target); -- add_disallowed(child, action, device, target, allow_suicide); -+ add_disallowed(child, action, device, target, allow_self); - } - - /*! --- -2.33.1.windows.1 - diff --git a/backport-Refactor-libcib-drop-op_common.patch b/backport-Refactor-libcib-drop-op_common.patch deleted file mode 100644 index 0497657067fb477a7cdbd24b184e4069d351e774..0000000000000000000000000000000000000000 --- a/backport-Refactor-libcib-drop-op_common.patch +++ /dev/null @@ -1,208 +0,0 @@ -From 300dbeb2d6e3a9be7b73e627c751373b82b95ee0 Mon Sep 17 00:00:00 2001 -From: Ken Gaillot -Date: Tue, 30 Jul 2024 17:32:21 -0500 -Subject: [PATCH] Refactor: libcib: drop op_common() - -It's more obscure than helpful ---- - lib/cib/cib_client.c | 32 +++++++------------------------- - lib/cib/cib_utils.c | 18 ++++++++++++------ - 2 files changed, 19 insertions(+), 31 deletions(-) - -diff --git a/lib/cib/cib_client.c b/lib/cib/cib_client.c -index c98042915e..40ede8e713 100644 ---- a/lib/cib/cib_client.c -+++ b/lib/cib/cib_client.c -@@ -26,14 +26,6 @@ - - static GHashTable *cib_op_callback_table = NULL; - --#define op_common(cib) do { \ -- if(cib == NULL) { \ -- return -EINVAL; \ -- } else if(cib->delegate_fn == NULL) { \ -- return -EPROTONOSUPPORT; \ -- } \ -- } while(0) -- - static int - cib_client_set_op_callback(cib_t *cib, - void (*callback) (const xmlNode * msg, int call_id, -@@ -250,7 +242,6 @@ cib_client_register_callback(cib_t *cib, int call_id, int timeout, - static int - cib_client_noop(cib_t * cib, int call_options) - { -- op_common(cib); - return cib_internal_op(cib, PCMK__CIB_REQUEST_NOOP, NULL, NULL, NULL, NULL, - call_options, cib->user); - } -@@ -258,7 +249,6 @@ cib_client_noop(cib_t * cib, int call_options) - static int - cib_client_ping(cib_t * cib, xmlNode ** output_data, int call_options) - { -- op_common(cib); - return cib_internal_op(cib, CRM_OP_PING, NULL, NULL, NULL, output_data, - call_options, cib->user); - } -@@ -273,7 +263,6 @@ static int - cib_client_query_from(cib_t * cib, const char *host, const char *section, - xmlNode ** output_data, int call_options) - { -- op_common(cib); - return cib_internal_op(cib, PCMK__CIB_REQUEST_QUERY, host, section, NULL, - output_data, call_options, cib->user); - } -@@ -281,7 +270,6 @@ cib_client_query_from(cib_t * cib, const char *host, const char *section, - static int - is_primary(cib_t *cib) - { -- op_common(cib); - return cib_internal_op(cib, PCMK__CIB_REQUEST_IS_PRIMARY, NULL, NULL, NULL, - NULL, cib_scope_local|cib_sync_call, cib->user); - } -@@ -289,7 +277,6 @@ is_primary(cib_t *cib) - static int - set_secondary(cib_t *cib, int call_options) - { -- op_common(cib); - return cib_internal_op(cib, PCMK__CIB_REQUEST_SECONDARY, NULL, NULL, NULL, - NULL, call_options, cib->user); - } -@@ -303,7 +290,6 @@ set_all_secondary(cib_t * cib, int call_options) - static int - set_primary(cib_t *cib, int call_options) - { -- op_common(cib); - crm_trace("Adding cib_scope_local to options"); - return cib_internal_op(cib, PCMK__CIB_REQUEST_PRIMARY, NULL, NULL, NULL, - NULL, call_options|cib_scope_local, cib->user); -@@ -312,7 +298,6 @@ set_primary(cib_t *cib, int call_options) - static int - cib_client_bump_epoch(cib_t * cib, int call_options) - { -- op_common(cib); - return cib_internal_op(cib, PCMK__CIB_REQUEST_BUMP, NULL, NULL, NULL, NULL, - call_options, cib->user); - } -@@ -320,7 +305,6 @@ cib_client_bump_epoch(cib_t * cib, int call_options) - static int - cib_client_upgrade(cib_t * cib, int call_options) - { -- op_common(cib); - return cib_internal_op(cib, PCMK__CIB_REQUEST_UPGRADE, NULL, NULL, NULL, - NULL, call_options, cib->user); - } -@@ -334,7 +318,6 @@ cib_client_sync(cib_t * cib, const char *section, int call_options) - static int - cib_client_sync_from(cib_t * cib, const char *host, const char *section, int call_options) - { -- op_common(cib); - return cib_internal_op(cib, PCMK__CIB_REQUEST_SYNC_TO_ALL, host, section, - NULL, NULL, call_options, cib->user); - } -@@ -342,7 +325,6 @@ cib_client_sync_from(cib_t * cib, const char *host, const char *section, int cal - static int - cib_client_create(cib_t * cib, const char *section, xmlNode * data, int call_options) - { -- op_common(cib); - return cib_internal_op(cib, PCMK__CIB_REQUEST_CREATE, NULL, section, data, - NULL, call_options, cib->user); - } -@@ -350,7 +332,6 @@ cib_client_create(cib_t * cib, const char *section, xmlNode * data, int call_opt - static int - cib_client_modify(cib_t * cib, const char *section, xmlNode * data, int call_options) - { -- op_common(cib); - return cib_internal_op(cib, PCMK__CIB_REQUEST_MODIFY, NULL, section, data, - NULL, call_options, cib->user); - } -@@ -358,7 +339,6 @@ cib_client_modify(cib_t * cib, const char *section, xmlNode * data, int call_opt - static int - cib_client_replace(cib_t * cib, const char *section, xmlNode * data, int call_options) - { -- op_common(cib); - return cib_internal_op(cib, PCMK__CIB_REQUEST_REPLACE, NULL, section, data, - NULL, call_options, cib->user); - } -@@ -366,7 +346,6 @@ cib_client_replace(cib_t * cib, const char *section, xmlNode * data, int call_op - static int - cib_client_delete(cib_t * cib, const char *section, xmlNode * data, int call_options) - { -- op_common(cib); - return cib_internal_op(cib, PCMK__CIB_REQUEST_DELETE, NULL, section, data, - NULL, call_options, cib->user); - } -@@ -374,7 +353,6 @@ cib_client_delete(cib_t * cib, const char *section, xmlNode * data, int call_opt - static int - cib_client_delete_absolute(cib_t * cib, const char *section, xmlNode * data, int call_options) - { -- op_common(cib); - return cib_internal_op(cib, PCMK__CIB_REQUEST_ABS_DELETE, NULL, section, - data, NULL, call_options, cib->user); - } -@@ -382,7 +360,6 @@ cib_client_delete_absolute(cib_t * cib, const char *section, xmlNode * data, int - static int - cib_client_erase(cib_t * cib, xmlNode ** output_data, int call_options) - { -- op_common(cib); - return cib_internal_op(cib, PCMK__CIB_REQUEST_ERASE, NULL, NULL, NULL, - output_data, call_options, cib->user); - } -@@ -392,7 +369,9 @@ cib_client_init_transaction(cib_t *cib) - { - int rc = pcmk_rc_ok; - -- op_common(cib); -+ if (cib == NULL) { -+ return -EINVAL; -+ } - - if (cib->transaction != NULL) { - // A client can have at most one transaction at a time -@@ -419,7 +398,10 @@ cib_client_end_transaction(cib_t *cib, bool commit, int call_options) - const char *client_id = NULL; - int rc = pcmk_ok; - -- op_common(cib); -+ if (cib == NULL) { -+ return -EINVAL; -+ } -+ - cib->cmds->client_id(cib, NULL, &client_id); - client_id = pcmk__s(client_id, "(unidentified)"); - -diff --git a/lib/cib/cib_utils.c b/lib/cib/cib_utils.c -index 34652dc97a..f868f11397 100644 ---- a/lib/cib/cib_utils.c -+++ b/lib/cib/cib_utils.c -@@ -884,15 +884,21 @@ cib_internal_op(cib_t * cib, const char *op, const char *host, - const char *section, xmlNode * data, - xmlNode ** output_data, int call_options, const char *user_name) - { -- int (*delegate) (cib_t * cib, const char *op, const char *host, -- const char *section, xmlNode * data, -- xmlNode ** output_data, int call_options, const char *user_name) = -- cib->delegate_fn; -+ int (*delegate)(cib_t *cib, const char *op, const char *host, -+ const char *section, xmlNode *data, xmlNode **output_data, -+ int call_options, const char *user_name) = NULL; - -- if(user_name == NULL) { -- user_name = getenv("CIB_user"); -+ if (cib == NULL) { -+ return -EINVAL; - } - -+ delegate = cib->delegate_fn; -+ if (delegate == NULL) { -+ return -EPROTONOSUPPORT; -+ } -+ if (user_name == NULL) { -+ user_name = getenv("CIB_user"); -+ } - return delegate(cib, op, host, section, data, output_data, call_options, user_name); - } - --- -2.25.1 - diff --git a/backport-Refactor-libcrmcommon-Add-pcmk__tls_client_try_hands.patch b/backport-Refactor-libcrmcommon-Add-pcmk__tls_client_try_hands.patch deleted file mode 100644 index b39f1256e12db29168ccd32c1cb9721df98fa3ac..0000000000000000000000000000000000000000 --- a/backport-Refactor-libcrmcommon-Add-pcmk__tls_client_try_hands.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 0f3b5d28cf74ca5eddae767eeba65aa8c53f5070 Mon Sep 17 00:00:00 2001 -From: Chris Lumens -Date: Wed, 7 Aug 2024 14:22:39 -0400 -Subject: [PATCH] Refactor: libcrmcommon: Add pcmk__tls_client_try_handshake. - -This is the guts of pcmk__tls_client_handshake, broken out into a -separate function that doesn't loop which can be reused elsewhere. -pcmk__tls_client_handshake can then be reimplemented in terms of this -new function. ---- - include/crm/common/remote_internal.h | 13 ++++++ - lib/common/remote.c | 59 +++++++++++++++++----------- - 2 files changed, 50 insertions(+), 22 deletions(-) - -diff --git a/include/crm/common/remote_internal.h b/include/crm/common/remote_internal.h -index a6a0a0a152..0ce4208cd1 100644 ---- a/include/crm/common/remote_internal.h -+++ b/include/crm/common/remote_internal.h -@@ -84,6 +84,19 @@ gnutls_session_t *pcmk__new_tls_session(int csock, unsigned int conn_type, - int pcmk__init_tls_dh(gnutls_dh_params_t *dh_params); - int pcmk__read_handshake_data(const pcmk__client_t *client); - -+/*! -+ * \internal -+ * \brief Make a single attempt to perform the client TLS handshake -+ * -+ * \param[in,out] remote Newly established remote connection -+ * \param[out] gnutls_rc If this is non-NULL, it will be set to the GnuTLS -+ * rc (for logging) if this function returns EPROTO, -+ * otherwise GNUTLS_E_SUCCESS -+ * -+ * \return Standard Pacemaker return code -+ */ -+int pcmk__tls_client_try_handshake(pcmk__remote_t *remote, int *gnutls_rc); -+ - /*! - * \internal - * \brief Perform client TLS handshake after establishing TCP socket -diff --git a/lib/common/remote.c b/lib/common/remote.c -index 0974ccfb1d..b28b782fa1 100644 ---- a/lib/common/remote.c -+++ b/lib/common/remote.c -@@ -129,36 +129,51 @@ localized_remote_header(pcmk__remote_t *remote) - #ifdef HAVE_GNUTLS_GNUTLS_H - - int --pcmk__tls_client_handshake(pcmk__remote_t *remote, int timeout_sec, -- int *gnutls_rc) -+pcmk__tls_client_try_handshake(pcmk__remote_t *remote, int *gnutls_rc) - { -- const time_t time_limit = time(NULL) + timeout_sec; -+ int rc = pcmk_rc_ok; - - if (gnutls_rc != NULL) { - *gnutls_rc = GNUTLS_E_SUCCESS; - } -+ -+ rc = gnutls_handshake(*remote->tls_session); -+ -+ switch (rc) { -+ case GNUTLS_E_SUCCESS: -+ rc = pcmk_rc_ok; -+ break; -+ -+ case GNUTLS_E_INTERRUPTED: -+ case GNUTLS_E_AGAIN: -+ rc = EAGAIN; -+ break; -+ -+ default: -+ if (gnutls_rc != NULL) { -+ *gnutls_rc = rc; -+ } -+ -+ rc = EPROTO; -+ break; -+ } -+ -+ return rc; -+} -+ -+int pcmk__tls_client_handshake(pcmk__remote_t *remote, int timeout_sec, -+ int *gnutls_rc) -+{ -+ const time_t time_limit = time(NULL) + timeout_sec; -+ - do { -- int rc = gnutls_handshake(*remote->tls_session); -- -- switch (rc) { -- case GNUTLS_E_SUCCESS: -- return pcmk_rc_ok; -- -- case GNUTLS_E_INTERRUPTED: -- case GNUTLS_E_AGAIN: -- rc = pcmk__remote_ready(remote, 1000); -- if ((rc != pcmk_rc_ok) && (rc != ETIME)) { // Fatal error -- return rc; -- } -- break; -- -- default: -- if (gnutls_rc != NULL) { -- *gnutls_rc = rc; -- } -- return EPROTO; -+ int rc = pcmk__tls_client_try_handshake(remote, gnutls_rc); -+ -+ if (rc != EAGAIN) { -+ return rc; - } - } while (time(NULL) < time_limit); -+ - return ETIME; - } - --- -2.33.1.windows.1 - diff --git a/backport-Refactor-libpacemaker-de-inline-pcmk__colocation_has.patch b/backport-Refactor-libpacemaker-de-inline-pcmk__colocation_has.patch deleted file mode 100644 index 9be750d78ecd8203a63fc9d75c714178dfea2e69..0000000000000000000000000000000000000000 --- a/backport-Refactor-libpacemaker-de-inline-pcmk__colocation_has.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 84e931b7e2f0dd9930f7074e0de441aba86b5dc1 Mon Sep 17 00:00:00 2001 -From: Ken Gaillot -Date: Tue, 30 Jul 2024 17:06:07 -0500 -Subject: [PATCH] Refactor: libpacemaker: de-inline - pcmk__colocation_has_influence() - -It's nontrivial ---- - lib/pacemaker/libpacemaker_private.h | 48 ++------------------------- - lib/pacemaker/pcmk_sched_colocation.c | 46 +++++++++++++++++++++++++ - 2 files changed, 49 insertions(+), 45 deletions(-) - -diff --git a/lib/pacemaker/libpacemaker_private.h b/lib/pacemaker/libpacemaker_private.h -index 3f8870b304..dec254b477 100644 ---- a/lib/pacemaker/libpacemaker_private.h -+++ b/lib/pacemaker/libpacemaker_private.h -@@ -595,51 +595,9 @@ void pcmk__new_colocation(const char *id, const char *node_attr, int score, - G_GNUC_INTERNAL - void pcmk__block_colocation_dependents(pcmk_action_t *action); - --/*! -- * \internal -- * \brief Check whether colocation's dependent preferences should be considered -- * -- * \param[in] colocation Colocation constraint -- * \param[in] rsc Primary instance (normally this will be -- * colocation->primary, which NULL will be treated as, -- * but for clones or bundles with multiple instances -- * this can be a particular instance) -- * -- * \return true if colocation influence should be effective, otherwise false -- */ --static inline bool --pcmk__colocation_has_influence(const pcmk__colocation_t *colocation, -- const pcmk_resource_t *rsc) --{ -- if (rsc == NULL) { -- rsc = colocation->primary; -- } -- -- /* A bundle replica colocates its remote connection with its container, -- * using a finite score so that the container can run on Pacemaker Remote -- * nodes. -- * -- * Moving a connection is lightweight and does not interrupt the service, -- * while moving a container is heavyweight and does interrupt the service, -- * so don't move a clean, active container based solely on the preferences -- * of its connection. -- * -- * This also avoids problematic scenarios where two containers want to -- * perpetually swap places. -- */ -- if (pcmk_is_set(colocation->dependent->flags, -- pcmk_rsc_remote_nesting_allowed) -- && !pcmk_is_set(rsc->flags, pcmk_rsc_failed) -- && pcmk__list_of_1(rsc->running_on)) { -- return false; -- } -- -- /* The dependent in a colocation influences the primary's location -- * if the PCMK_XA_INFLUENCE option is true or the primary is not yet active. -- */ -- return pcmk_is_set(colocation->flags, pcmk__coloc_influence) -- || (rsc->running_on == NULL); --} -+G_GNUC_INTERNAL -+bool pcmk__colocation_has_influence(const pcmk__colocation_t *colocation, -+ const pcmk_resource_t *rsc); - - - // Ordering constraints (pcmk_sched_ordering.c) -diff --git a/lib/pacemaker/pcmk_sched_colocation.c b/lib/pacemaker/pcmk_sched_colocation.c -index 43edebc03c..ccaf1cc10f 100644 ---- a/lib/pacemaker/pcmk_sched_colocation.c -+++ b/lib/pacemaker/pcmk_sched_colocation.c -@@ -1024,6 +1024,52 @@ pcmk__unpack_colocation(xmlNode *xml_obj, pcmk_scheduler_t *scheduler) - } - } - -+/*! -+ * \internal -+ * \brief Check whether colocation's dependent preferences should be considered -+ * -+ * \param[in] colocation Colocation constraint -+ * \param[in] rsc Primary instance (normally this will be -+ * colocation->primary, which NULL will be treated as, -+ * but for clones or bundles with multiple instances -+ * this can be a particular instance) -+ * -+ * \return true if colocation influence should be effective, otherwise false -+ */ -+bool -+pcmk__colocation_has_influence(const pcmk__colocation_t *colocation, -+ const pcmk_resource_t *rsc) -+{ -+ if (rsc == NULL) { -+ rsc = colocation->primary; -+ } -+ -+ /* A bundle replica colocates its remote connection with its container, -+ * using a finite score so that the container can run on Pacemaker Remote -+ * nodes. -+ * -+ * Moving a connection is lightweight and does not interrupt the service, -+ * while moving a container is heavyweight and does interrupt the service, -+ * so don't move a clean, active container based solely on the preferences -+ * of its connection. -+ * -+ * This also avoids problematic scenarios where two containers want to -+ * perpetually swap places. -+ */ -+ if (pcmk_is_set(colocation->dependent->flags, -+ pcmk_rsc_remote_nesting_allowed) -+ && !pcmk_is_set(rsc->flags, pcmk_rsc_failed) -+ && pcmk__list_of_1(rsc->running_on)) { -+ return false; -+ } -+ -+ /* The dependent in a colocation influences the primary's location -+ * if the PCMK_XA_INFLUENCE option is true or the primary is not yet active. -+ */ -+ return pcmk_is_set(colocation->flags, pcmk__coloc_influence) -+ || (rsc->running_on == NULL); -+} -+ - /*! - * \internal - * \brief Make actions of a given type unrunnable for a given resource --- -2.33.1.windows.1 - diff --git a/backport-Refactor-lrmd-Move-TLS-connection-success-failure-in.patch b/backport-Refactor-lrmd-Move-TLS-connection-success-failure-in.patch deleted file mode 100644 index 9457bec959217ffff04db5dde0b3e3c08772ce59..0000000000000000000000000000000000000000 --- a/backport-Refactor-lrmd-Move-TLS-connection-success-failure-in.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 15894cd13edd0612e6213d3aaca2de07e06cc851 Mon Sep 17 00:00:00 2001 -From: Chris Lumens -Date: Thu, 8 Aug 2024 13:26:40 -0400 -Subject: [PATCH] Refactor: lrmd: Move TLS connection success/failure into - functions. - ---- - lib/lrmd/lrmd_client.c | 44 ++++++++++++++++++++++++++++++------------ - 1 file changed, 32 insertions(+), 12 deletions(-) - -diff --git a/lib/lrmd/lrmd_client.c b/lib/lrmd/lrmd_client.c -index 74292fb8fe..ee0daae9b4 100644 ---- a/lib/lrmd/lrmd_client.c -+++ b/lib/lrmd/lrmd_client.c -@@ -67,8 +67,11 @@ gnutls_psk_client_credentials_t psk_cred_s; - static void lrmd_tls_disconnect(lrmd_t * lrmd); - static int global_remote_msg_id = 0; - static void lrmd_tls_connection_destroy(gpointer userdata); -+static int add_tls_to_mainloop(lrmd_t *lrmd, bool do_handshake); - #endif - -+static void report_async_connection_result(lrmd_t * lrmd, int rc); -+ - typedef struct lrmd_private_s { - uint64_t type; - char *token; -@@ -1386,6 +1389,32 @@ lrmd_gnutls_global_init(void) - } - gnutls_init = 1; - } -+ -+static void -+tls_handshake_failed(lrmd_t *lrmd, int tls_rc, int rc) -+{ -+ lrmd_private_t *native = lrmd->lrmd_private; -+ -+ crm_warn("Disconnecting after TLS handshake with " -+ "Pacemaker Remote server %s:%d failed: %s", -+ native->server, native->port, -+ (rc == EPROTO)? gnutls_strerror(tls_rc) : pcmk_rc_str(rc)); -+ gnutls_deinit(*native->remote->tls_session); -+ gnutls_free(native->remote->tls_session); -+ native->remote->tls_session = NULL; -+ lrmd_tls_connection_destroy(lrmd); -+} -+ -+static void -+tls_handshake_succeeded(lrmd_t *lrmd) -+{ -+ lrmd_private_t *native = lrmd->lrmd_private; -+ -+ crm_info("TLS connection to Pacemaker Remote server %s:%d succeeded", -+ native->server, native->port); -+ add_tls_to_mainloop(lrmd, true); -+ report_async_connection_result(lrmd, pcmk_rc2legacy(pcmk_rc_ok)); -+} - #endif - - static void -@@ -1420,15 +1449,9 @@ tls_client_handshake(lrmd_t *lrmd) - &tls_rc); - - if (rc != pcmk_rc_ok) { -- crm_warn("Disconnecting after TLS handshake with " -- "Pacemaker Remote server %s:%d failed: %s", -- native->server, native->port, -- (rc == EPROTO)? gnutls_strerror(tls_rc) : pcmk_rc_str(rc)); -- gnutls_deinit(*native->remote->tls_session); -- gnutls_free(native->remote->tls_session); -- native->remote->tls_session = NULL; -- lrmd_tls_connection_destroy(lrmd); -+ tls_handshake_failed(lrmd, tls_rc, rc); - } -+ - return rc; - } - -@@ -1526,10 +1549,7 @@ lrmd_tcp_connect_cb(void *userdata, int rc, int sock) - return; - } - -- crm_info("TLS connection to Pacemaker Remote server %s:%d succeeded", -- native->server, native->port); -- rc = add_tls_to_mainloop(lrmd, true); -- report_async_connection_result(lrmd, pcmk_rc2legacy(rc)); -+ tls_handshake_succeeded(lrmd); - } - - static int --- -2.33.1.windows.1 - diff --git a/backport-Test-cts-scheduler-update-expected-graph-outputs-for.patch b/backport-Test-cts-scheduler-update-expected-graph-outputs-for.patch deleted file mode 100644 index b37d3264ea963792fdc50b3f295408eb946e94ef..0000000000000000000000000000000000000000 --- a/backport-Test-cts-scheduler-update-expected-graph-outputs-for.patch +++ /dev/null @@ -1,9150 +0,0 @@ -From 5dfcd9ebe476a4813dbcbf1339a2125b79afd034 Mon Sep 17 00:00:00 2001 -From: Ken Gaillot -Date: Thu, 1 Aug 2024 11:37:38 -0500 -Subject: [PATCH] Test: cts-scheduler: update expected graph outputs for - transition number change - -Every test changes transition_id from 0 to 1 ---- - cts/scheduler/exp/1-a-then-bm-move-b.exp | 2 +- - cts/scheduler/exp/10-a-then-bm-b-move-a-clone.exp | 2 +- - cts/scheduler/exp/11-a-then-bm-b-move-a-clone-starting.exp | 2 +- - cts/scheduler/exp/1360.exp | 2 +- - cts/scheduler/exp/1484.exp | 2 +- - cts/scheduler/exp/1494.exp | 2 +- - cts/scheduler/exp/2-am-then-b-move-a.exp | 2 +- - cts/scheduler/exp/3-am-then-bm-both-migrate.exp | 2 +- - cts/scheduler/exp/4-am-then-bm-b-not-migratable.exp | 2 +- - cts/scheduler/exp/5-am-then-bm-a-not-migratable.exp | 2 +- - cts/scheduler/exp/594.exp | 2 +- - cts/scheduler/exp/6-migrate-group.exp | 2 +- - cts/scheduler/exp/662.exp | 2 +- - cts/scheduler/exp/696.exp | 2 +- - cts/scheduler/exp/7-migrate-group-one-unmigratable.exp | 2 +- - cts/scheduler/exp/726.exp | 2 +- - cts/scheduler/exp/735.exp | 2 +- - cts/scheduler/exp/764.exp | 2 +- - cts/scheduler/exp/797.exp | 2 +- - cts/scheduler/exp/8-am-then-bm-a-migrating-b-stopping.exp | 2 +- - cts/scheduler/exp/829.exp | 2 +- - cts/scheduler/exp/9-am-then-bm-b-migrating-a-stopping.exp | 2 +- - cts/scheduler/exp/994-2.exp | 2 +- - cts/scheduler/exp/994.exp | 2 +- - cts/scheduler/exp/a-demote-then-b-migrate.exp | 2 +- - cts/scheduler/exp/a-promote-then-b-migrate.exp | 2 +- - cts/scheduler/exp/allow-unhealthy-nodes.exp | 2 +- - cts/scheduler/exp/anon-instance-pending.exp | 2 +- - cts/scheduler/exp/anti-colocation-order.exp | 2 +- - cts/scheduler/exp/anti-colocation-promoted.exp | 2 +- - cts/scheduler/exp/anti-colocation-unpromoted.exp | 2 +- - cts/scheduler/exp/asymmetric.exp | 2 +- - cts/scheduler/exp/asymmetrical-order-move.exp | 2 +- - cts/scheduler/exp/asymmetrical-order-restart.exp | 2 +- - cts/scheduler/exp/attrs1.exp | 2 +- - cts/scheduler/exp/attrs2.exp | 2 +- - cts/scheduler/exp/attrs3.exp | 2 +- - cts/scheduler/exp/attrs4.exp | 2 +- - cts/scheduler/exp/attrs5.exp | 2 +- - cts/scheduler/exp/attrs6.exp | 2 +- - cts/scheduler/exp/attrs7.exp | 2 +- - cts/scheduler/exp/attrs8.exp | 2 +- - cts/scheduler/exp/balanced.exp | 2 +- - cts/scheduler/exp/banned-group-inner-constraints.exp | 2 +- - cts/scheduler/exp/base-score.exp | 2 +- - cts/scheduler/exp/bnc-515172.exp | 2 +- - cts/scheduler/exp/bug-1572-1.exp | 2 +- - cts/scheduler/exp/bug-1572-2.exp | 2 +- - cts/scheduler/exp/bug-1573.exp | 2 +- - cts/scheduler/exp/bug-1685.exp | 2 +- - cts/scheduler/exp/bug-1718.exp | 2 +- - cts/scheduler/exp/bug-1765.exp | 2 +- - cts/scheduler/exp/bug-1820-1.exp | 2 +- - cts/scheduler/exp/bug-1820.exp | 2 +- - cts/scheduler/exp/bug-1822.exp | 2 +- - cts/scheduler/exp/bug-5014-A-start-B-start.exp | 2 +- - cts/scheduler/exp/bug-5014-A-stop-B-started.exp | 2 +- - cts/scheduler/exp/bug-5014-A-stopped-B-stopped.exp | 2 +- - cts/scheduler/exp/bug-5014-CLONE-A-start-B-start.exp | 2 +- - cts/scheduler/exp/bug-5014-CLONE-A-stop-B-started.exp | 2 +- - cts/scheduler/exp/bug-5014-CthenAthenB-C-stopped.exp | 2 +- - cts/scheduler/exp/bug-5014-GROUP-A-start-B-start.exp | 2 +- - cts/scheduler/exp/bug-5014-GROUP-A-stopped-B-started.exp | 2 +- - cts/scheduler/exp/bug-5014-GROUP-A-stopped-B-stopped.exp | 2 +- - cts/scheduler/exp/bug-5014-ordered-set-symmetrical-false.exp | 2 +- - cts/scheduler/exp/bug-5014-ordered-set-symmetrical-true.exp | 2 +- - cts/scheduler/exp/bug-5025-1.exp | 2 +- - cts/scheduler/exp/bug-5025-2.exp | 2 +- - cts/scheduler/exp/bug-5025-3.exp | 2 +- - cts/scheduler/exp/bug-5025-4.exp | 2 +- - cts/scheduler/exp/bug-5028-bottom.exp | 2 +- - cts/scheduler/exp/bug-5028-detach.exp | 2 +- - cts/scheduler/exp/bug-5028.exp | 2 +- - cts/scheduler/exp/bug-5038.exp | 2 +- - cts/scheduler/exp/bug-5059.exp | 2 +- - cts/scheduler/exp/bug-5069-op-disabled.exp | 2 +- - cts/scheduler/exp/bug-5069-op-enabled.exp | 2 +- - cts/scheduler/exp/bug-5140-require-all-false.exp | 2 +- - cts/scheduler/exp/bug-5143-ms-shuffle.exp | 2 +- - cts/scheduler/exp/bug-5186-partial-migrate.exp | 2 +- - cts/scheduler/exp/bug-cl-5168.exp | 2 +- - cts/scheduler/exp/bug-cl-5170.exp | 2 +- - cts/scheduler/exp/bug-cl-5212.exp | 2 +- - cts/scheduler/exp/bug-cl-5213.exp | 2 +- - cts/scheduler/exp/bug-cl-5219.exp | 2 +- - cts/scheduler/exp/bug-cl-5247.exp | 2 +- - cts/scheduler/exp/bug-lf-1852.exp | 2 +- - cts/scheduler/exp/bug-lf-1920.exp | 2 +- - cts/scheduler/exp/bug-lf-2106.exp | 2 +- - cts/scheduler/exp/bug-lf-2153.exp | 2 +- - cts/scheduler/exp/bug-lf-2160.exp | 2 +- - cts/scheduler/exp/bug-lf-2171.exp | 2 +- - cts/scheduler/exp/bug-lf-2213.exp | 2 +- - cts/scheduler/exp/bug-lf-2317.exp | 2 +- - cts/scheduler/exp/bug-lf-2358.exp | 2 +- - cts/scheduler/exp/bug-lf-2361.exp | 2 +- - cts/scheduler/exp/bug-lf-2422.exp | 2 +- - cts/scheduler/exp/bug-lf-2435.exp | 2 +- - cts/scheduler/exp/bug-lf-2445.exp | 2 +- - cts/scheduler/exp/bug-lf-2453.exp | 2 +- - cts/scheduler/exp/bug-lf-2474.exp | 2 +- - cts/scheduler/exp/bug-lf-2493.exp | 2 +- - cts/scheduler/exp/bug-lf-2508.exp | 2 +- - cts/scheduler/exp/bug-lf-2544.exp | 2 +- - cts/scheduler/exp/bug-lf-2551.exp | 2 +- - cts/scheduler/exp/bug-lf-2574.exp | 2 +- - cts/scheduler/exp/bug-lf-2581.exp | 2 +- - cts/scheduler/exp/bug-lf-2606.exp | 2 +- - cts/scheduler/exp/bug-lf-2619.exp | 2 +- - cts/scheduler/exp/bug-n-385265-2.exp | 2 +- - cts/scheduler/exp/bug-n-385265.exp | 2 +- - cts/scheduler/exp/bug-n-387749.exp | 2 +- - cts/scheduler/exp/bug-pm-11.exp | 2 +- - cts/scheduler/exp/bug-pm-12.exp | 2 +- - cts/scheduler/exp/bug-rh-1097457.exp | 2 +- - cts/scheduler/exp/bug-rh-880249.exp | 2 +- - cts/scheduler/exp/bug-suse-707150.exp | 2 +- - cts/scheduler/exp/bundle-connection-with-container.exp | 2 +- - cts/scheduler/exp/bundle-interleave-promote.exp | 2 +- - cts/scheduler/exp/bundle-interleave-start.exp | 2 +- - cts/scheduler/exp/bundle-nested-colocation.exp | 2 +- - cts/scheduler/exp/bundle-order-fencing.exp | 2 +- - cts/scheduler/exp/bundle-order-partial-start-2.exp | 2 +- - cts/scheduler/exp/bundle-order-partial-start.exp | 2 +- - cts/scheduler/exp/bundle-order-partial-stop.exp | 2 +- - cts/scheduler/exp/bundle-order-startup-clone-2.exp | 2 +- - cts/scheduler/exp/bundle-order-startup-clone.exp | 2 +- - cts/scheduler/exp/bundle-order-startup.exp | 2 +- - cts/scheduler/exp/bundle-order-stop-clone.exp | 2 +- - cts/scheduler/exp/bundle-order-stop-on-remote.exp | 2 +- - cts/scheduler/exp/bundle-order-stop.exp | 2 +- - cts/scheduler/exp/bundle-probe-order-1.exp | 2 +- - cts/scheduler/exp/bundle-probe-order-2.exp | 2 +- - cts/scheduler/exp/bundle-probe-order-3.exp | 2 +- - cts/scheduler/exp/bundle-probe-remotes.exp | 2 +- - cts/scheduler/exp/bundle-promoted-anticolocation-1.exp | 2 +- - cts/scheduler/exp/bundle-promoted-anticolocation-2.exp | 2 +- - cts/scheduler/exp/bundle-promoted-anticolocation-3.exp | 2 +- - cts/scheduler/exp/bundle-promoted-anticolocation-4.exp | 2 +- - cts/scheduler/exp/bundle-promoted-anticolocation-5.exp | 2 +- - cts/scheduler/exp/bundle-promoted-anticolocation-6.exp | 2 +- - cts/scheduler/exp/bundle-promoted-colocation-1.exp | 2 +- - cts/scheduler/exp/bundle-promoted-colocation-2.exp | 2 +- - cts/scheduler/exp/bundle-promoted-colocation-3.exp | 2 +- - cts/scheduler/exp/bundle-promoted-colocation-4.exp | 2 +- - cts/scheduler/exp/bundle-promoted-colocation-5.exp | 2 +- - cts/scheduler/exp/bundle-promoted-colocation-6.exp | 2 +- - cts/scheduler/exp/bundle-promoted-location-1.exp | 2 +- - cts/scheduler/exp/bundle-promoted-location-2.exp | 2 +- - cts/scheduler/exp/bundle-promoted-location-3.exp | 2 +- - cts/scheduler/exp/bundle-promoted-location-4.exp | 2 +- - cts/scheduler/exp/bundle-promoted-location-5.exp | 2 +- - cts/scheduler/exp/bundle-promoted-location-6.exp | 2 +- - cts/scheduler/exp/bundle-replicas-change.exp | 2 +- - cts/scheduler/exp/cancel-behind-moving-remote.exp | 2 +- - cts/scheduler/exp/clbz5007-promotable-colocation.exp | 2 +- - cts/scheduler/exp/clone-anon-dup.exp | 2 +- - cts/scheduler/exp/clone-anon-failcount.exp | 2 +- - cts/scheduler/exp/clone-anon-probe-1.exp | 2 +- - cts/scheduler/exp/clone-anon-probe-2.exp | 2 +- - cts/scheduler/exp/clone-fail-block-colocation.exp | 2 +- - cts/scheduler/exp/clone-interleave-1.exp | 2 +- - cts/scheduler/exp/clone-interleave-2.exp | 2 +- - cts/scheduler/exp/clone-interleave-3.exp | 2 +- - cts/scheduler/exp/clone-max-zero.exp | 2 +- - cts/scheduler/exp/clone-no-shuffle.exp | 2 +- - cts/scheduler/exp/clone-order-16instances.exp | 2 +- - cts/scheduler/exp/clone-order-primitive.exp | 2 +- - cts/scheduler/exp/clone-recover-no-shuffle-1.exp | 2 +- - cts/scheduler/exp/clone-recover-no-shuffle-10.exp | 2 +- - cts/scheduler/exp/clone-recover-no-shuffle-11.exp | 2 +- - cts/scheduler/exp/clone-recover-no-shuffle-12.exp | 2 +- - cts/scheduler/exp/clone-recover-no-shuffle-2.exp | 2 +- - cts/scheduler/exp/clone-recover-no-shuffle-3.exp | 2 +- - cts/scheduler/exp/clone-recover-no-shuffle-4.exp | 2 +- - cts/scheduler/exp/clone-recover-no-shuffle-5.exp | 2 +- - cts/scheduler/exp/clone-recover-no-shuffle-6.exp | 2 +- - cts/scheduler/exp/clone-recover-no-shuffle-7.exp | 2 +- - cts/scheduler/exp/clone-recover-no-shuffle-8.exp | 2 +- - cts/scheduler/exp/clone-recover-no-shuffle-9.exp | 2 +- - cts/scheduler/exp/clone-require-all-1.exp | 2 +- - cts/scheduler/exp/clone-require-all-2.exp | 2 +- - cts/scheduler/exp/clone-require-all-3.exp | 2 +- - cts/scheduler/exp/clone-require-all-4.exp | 2 +- - cts/scheduler/exp/clone-require-all-5.exp | 2 +- - cts/scheduler/exp/clone-require-all-6.exp | 2 +- - cts/scheduler/exp/clone-require-all-7.exp | 2 +- - cts/scheduler/exp/clone-require-all-no-interleave-1.exp | 2 +- - cts/scheduler/exp/clone-require-all-no-interleave-2.exp | 2 +- - cts/scheduler/exp/clone-require-all-no-interleave-3.exp | 2 +- - cts/scheduler/exp/clone-requires-quorum-recovery.exp | 2 +- - cts/scheduler/exp/clone-requires-quorum.exp | 2 +- - cts/scheduler/exp/clone_min_interleave_start_one.exp | 2 +- - cts/scheduler/exp/clone_min_interleave_start_two.exp | 2 +- - cts/scheduler/exp/clone_min_interleave_stop_one.exp | 2 +- - cts/scheduler/exp/clone_min_interleave_stop_two.exp | 2 +- - cts/scheduler/exp/clone_min_start_one.exp | 2 +- - cts/scheduler/exp/clone_min_start_two.exp | 2 +- - cts/scheduler/exp/clone_min_stop_all.exp | 2 +- - cts/scheduler/exp/clone_min_stop_one.exp | 2 +- - cts/scheduler/exp/clone_min_stop_two.exp | 2 +- - cts/scheduler/exp/cloned-group-stop.exp | 2 +- - cts/scheduler/exp/cloned-group.exp | 2 +- - cts/scheduler/exp/cloned_start_one.exp | 2 +- - cts/scheduler/exp/cloned_start_two.exp | 2 +- - cts/scheduler/exp/cloned_stop_one.exp | 2 +- - cts/scheduler/exp/cloned_stop_two.exp | 2 +- - cts/scheduler/exp/cluster-specific-params.exp | 2 +- - cts/scheduler/exp/colo_promoted_w_native.exp | 2 +- - cts/scheduler/exp/colo_unpromoted_w_native.exp | 2 +- - cts/scheduler/exp/coloc-attr.exp | 2 +- - cts/scheduler/exp/coloc-clone-stays-active.exp | 2 +- - cts/scheduler/exp/coloc-cloned-group-promoted-dependent1.exp | 2 +- - cts/scheduler/exp/coloc-cloned-group-promoted-dependent2.exp | 2 +- - cts/scheduler/exp/coloc-dependee-should-move.exp | 2 +- - cts/scheduler/exp/coloc-dependee-should-stay.exp | 2 +- - cts/scheduler/exp/coloc-group.exp | 2 +- - cts/scheduler/exp/coloc-intra-set.exp | 2 +- - cts/scheduler/exp/coloc-list.exp | 2 +- - cts/scheduler/exp/coloc-loop.exp | 2 +- - cts/scheduler/exp/coloc-many-one.exp | 2 +- - cts/scheduler/exp/coloc-negative-group.exp | 2 +- - cts/scheduler/exp/coloc-optional-promoted-dependent-moves-1.exp | 2 +- - cts/scheduler/exp/coloc-optional-promoted-dependent-moves-2.exp | 2 +- - cts/scheduler/exp/coloc-optional-promoted-dependent-stays-1.exp | 2 +- - cts/scheduler/exp/coloc-optional-promoted-dependent-stays-2.exp | 2 +- - cts/scheduler/exp/coloc-unpromoted-anti.exp | 2 +- - cts/scheduler/exp/coloc-with-inner-group-member.exp | 2 +- - cts/scheduler/exp/coloc_fp_logic.exp | 2 +- - cts/scheduler/exp/colocate-primitive-with-clone.exp | 2 +- - cts/scheduler/exp/colocate-unmanaged-group.exp | 2 +- - cts/scheduler/exp/colocated-utilization-clone.exp | 2 +- - cts/scheduler/exp/colocated-utilization-group.exp | 2 +- - cts/scheduler/exp/colocated-utilization-primitive-1.exp | 2 +- - cts/scheduler/exp/colocated-utilization-primitive-2.exp | 2 +- - cts/scheduler/exp/colocation-influence.exp | 2 +- - cts/scheduler/exp/colocation-priority-group.exp | 2 +- - cts/scheduler/exp/colocation-vs-stickiness.exp | 2 +- - cts/scheduler/exp/colocation_constraint_stops_promoted.exp | 2 +- - cts/scheduler/exp/colocation_constraint_stops_unpromoted.exp | 2 +- - cts/scheduler/exp/comments.exp | 2 +- - cts/scheduler/exp/complex_enforce_colo.exp | 2 +- - cts/scheduler/exp/concurrent-fencing.exp | 2 +- - cts/scheduler/exp/container-1.exp | 2 +- - cts/scheduler/exp/container-2.exp | 2 +- - cts/scheduler/exp/container-3.exp | 2 +- - cts/scheduler/exp/container-4.exp | 2 +- - cts/scheduler/exp/container-group-1.exp | 2 +- - cts/scheduler/exp/container-group-2.exp | 2 +- - cts/scheduler/exp/container-group-3.exp | 2 +- - cts/scheduler/exp/container-group-4.exp | 2 +- - cts/scheduler/exp/container-is-remote-node.exp | 2 +- - cts/scheduler/exp/date-1.exp | 2 +- - cts/scheduler/exp/date-2.exp | 2 +- - cts/scheduler/exp/date-3.exp | 2 +- - cts/scheduler/exp/dc-fence-ordering.exp | 2 +- - cts/scheduler/exp/enforce-colo1.exp | 2 +- - cts/scheduler/exp/expire-non-blocked-failure.exp | 2 +- - cts/scheduler/exp/expired-failed-probe-primitive.exp | 2 +- - cts/scheduler/exp/expired-stop-1.exp | 2 +- - cts/scheduler/exp/failcount-block.exp | 2 +- - cts/scheduler/exp/failcount.exp | 2 +- - cts/scheduler/exp/failed-demote-recovery-promoted.exp | 2 +- - cts/scheduler/exp/failed-demote-recovery.exp | 2 +- - cts/scheduler/exp/failed-probe-clone.exp | 2 +- - cts/scheduler/exp/failed-probe-primitive.exp | 2 +- - cts/scheduler/exp/failed-sticky-anticolocated-group.exp | 2 +- - cts/scheduler/exp/failed-sticky-group.exp | 2 +- - cts/scheduler/exp/force-anon-clone-max.exp | 2 +- - cts/scheduler/exp/group-anticolocation-2.exp | 2 +- - cts/scheduler/exp/group-anticolocation-3.exp | 2 +- - cts/scheduler/exp/group-anticolocation-4.exp | 2 +- - cts/scheduler/exp/group-anticolocation-5.exp | 2 +- - cts/scheduler/exp/group-anticolocation.exp | 2 +- - cts/scheduler/exp/group-colocation-failure.exp | 2 +- - cts/scheduler/exp/group-dependents.exp | 2 +- - cts/scheduler/exp/group-fail.exp | 2 +- - cts/scheduler/exp/group-stop-ordering.exp | 2 +- - cts/scheduler/exp/group-unmanaged-stopped.exp | 2 +- - cts/scheduler/exp/group-unmanaged.exp | 2 +- - cts/scheduler/exp/group1.exp | 2 +- - cts/scheduler/exp/group10.exp | 2 +- - cts/scheduler/exp/group11.exp | 2 +- - cts/scheduler/exp/group13.exp | 2 +- - cts/scheduler/exp/group14.exp | 2 +- - cts/scheduler/exp/group15.exp | 2 +- - cts/scheduler/exp/group2.exp | 2 +- - cts/scheduler/exp/group3.exp | 2 +- - cts/scheduler/exp/group4.exp | 2 +- - cts/scheduler/exp/group5.exp | 2 +- - cts/scheduler/exp/group6.exp | 2 +- - cts/scheduler/exp/group7.exp | 2 +- - cts/scheduler/exp/group8.exp | 2 +- - cts/scheduler/exp/group9.exp | 2 +- - cts/scheduler/exp/guest-host-not-fenceable.exp | 2 +- - cts/scheduler/exp/guest-node-cleanup.exp | 2 +- - cts/scheduler/exp/guest-node-host-dies.exp | 2 +- - cts/scheduler/exp/history-1.exp | 2 +- - cts/scheduler/exp/honor_stonith_rsc_order1.exp | 2 +- - cts/scheduler/exp/honor_stonith_rsc_order2.exp | 2 +- - cts/scheduler/exp/honor_stonith_rsc_order3.exp | 2 +- - cts/scheduler/exp/honor_stonith_rsc_order4.exp | 2 +- - cts/scheduler/exp/ignore_stonith_rsc_order1.exp | 2 +- - cts/scheduler/exp/ignore_stonith_rsc_order2.exp | 2 +- - cts/scheduler/exp/ignore_stonith_rsc_order3.exp | 2 +- - cts/scheduler/exp/ignore_stonith_rsc_order4.exp | 2 +- - cts/scheduler/exp/inc0.exp | 2 +- - cts/scheduler/exp/inc1.exp | 2 +- - cts/scheduler/exp/inc10.exp | 2 +- - cts/scheduler/exp/inc11.exp | 2 +- - cts/scheduler/exp/inc12.exp | 2 +- - cts/scheduler/exp/inc2.exp | 2 +- - cts/scheduler/exp/inc3.exp | 2 +- - cts/scheduler/exp/inc4.exp | 2 +- - cts/scheduler/exp/inc5.exp | 2 +- - cts/scheduler/exp/inc6.exp | 2 +- - cts/scheduler/exp/inc7.exp | 2 +- - cts/scheduler/exp/inc8.exp | 2 +- - cts/scheduler/exp/inc9.exp | 2 +- - cts/scheduler/exp/interleave-0.exp | 2 +- - cts/scheduler/exp/interleave-1.exp | 2 +- - cts/scheduler/exp/interleave-2.exp | 2 +- - cts/scheduler/exp/interleave-3.exp | 2 +- - cts/scheduler/exp/interleave-pseudo-stop.exp | 2 +- - cts/scheduler/exp/interleave-restart.exp | 2 +- - cts/scheduler/exp/interleave-stop.exp | 2 +- - cts/scheduler/exp/intervals.exp | 2 +- - cts/scheduler/exp/leftover-pending-monitor.exp | 2 +- - cts/scheduler/exp/load-stopped-loop-2.exp | 2 +- - cts/scheduler/exp/load-stopped-loop.exp | 2 +- - cts/scheduler/exp/location-date-rules-1.exp | 2 +- - cts/scheduler/exp/location-date-rules-2.exp | 2 +- - cts/scheduler/exp/location-sets-templates.exp | 2 +- - cts/scheduler/exp/managed-0.exp | 2 +- - cts/scheduler/exp/managed-1.exp | 2 +- - cts/scheduler/exp/managed-2.exp | 2 +- - cts/scheduler/exp/migrate-1.exp | 2 +- - cts/scheduler/exp/migrate-2.exp | 2 +- - cts/scheduler/exp/migrate-3.exp | 2 +- - cts/scheduler/exp/migrate-4.exp | 2 +- - cts/scheduler/exp/migrate-5.exp | 2 +- - cts/scheduler/exp/migrate-begin.exp | 2 +- - cts/scheduler/exp/migrate-both-vms.exp | 2 +- - cts/scheduler/exp/migrate-fail-2.exp | 2 +- - cts/scheduler/exp/migrate-fail-3.exp | 2 +- - cts/scheduler/exp/migrate-fail-4.exp | 2 +- - cts/scheduler/exp/migrate-fail-5.exp | 2 +- - cts/scheduler/exp/migrate-fail-6.exp | 2 +- - cts/scheduler/exp/migrate-fail-7.exp | 2 +- - cts/scheduler/exp/migrate-fail-8.exp | 2 +- - cts/scheduler/exp/migrate-fail-9.exp | 2 +- - cts/scheduler/exp/migrate-fencing.exp | 2 +- - cts/scheduler/exp/migrate-partial-1.exp | 2 +- - cts/scheduler/exp/migrate-partial-2.exp | 2 +- - cts/scheduler/exp/migrate-partial-3.exp | 2 +- - cts/scheduler/exp/migrate-partial-4.exp | 2 +- - cts/scheduler/exp/migrate-shutdown.exp | 2 +- - cts/scheduler/exp/migrate-start-complex.exp | 2 +- - cts/scheduler/exp/migrate-start.exp | 2 +- - cts/scheduler/exp/migrate-stop-complex.exp | 2 +- - cts/scheduler/exp/migrate-stop-start-complex.exp | 2 +- - cts/scheduler/exp/migrate-stop.exp | 2 +- - cts/scheduler/exp/migrate-stop_start.exp | 2 +- - cts/scheduler/exp/migrate-success.exp | 2 +- - cts/scheduler/exp/migration-behind-migrating-remote.exp | 2 +- - cts/scheduler/exp/migration-intermediary-cleaned.exp | 2 +- - cts/scheduler/exp/migration-ping-pong.exp | 2 +- - cts/scheduler/exp/minimal.exp | 2 +- - cts/scheduler/exp/mon-rsc-1.exp | 2 +- - cts/scheduler/exp/mon-rsc-2.exp | 2 +- - cts/scheduler/exp/mon-rsc-3.exp | 2 +- - cts/scheduler/exp/mon-rsc-4.exp | 2 +- - cts/scheduler/exp/monitor-onfail-restart.exp | 2 +- - cts/scheduler/exp/monitor-onfail-stop.exp | 2 +- - cts/scheduler/exp/monitor-recovery.exp | 2 +- - cts/scheduler/exp/multi1.exp | 2 +- - cts/scheduler/exp/multiple-active-block-group.exp | 2 +- - cts/scheduler/exp/multiple-monitor-one-failed.exp | 2 +- - cts/scheduler/exp/multiply-active-stonith.exp | 2 +- - cts/scheduler/exp/nested-remote-recovery.exp | 2 +- - cts/scheduler/exp/no-promote-on-unrunnable-guest.exp | 2 +- - cts/scheduler/exp/no_quorum_demote.exp | 2 +- - cts/scheduler/exp/node-maintenance-1.exp | 2 +- - cts/scheduler/exp/node-maintenance-2.exp | 2 +- - cts/scheduler/exp/node-pending-timeout.exp | 2 +- - cts/scheduler/exp/not-installed-agent.exp | 2 +- - cts/scheduler/exp/not-installed-tools.exp | 2 +- - cts/scheduler/exp/not-reschedule-unneeded-monitor.exp | 2 +- - cts/scheduler/exp/notifs-for-unrunnable.exp | 2 +- - cts/scheduler/exp/notify-0.exp | 2 +- - cts/scheduler/exp/notify-1.exp | 2 +- - cts/scheduler/exp/notify-2.exp | 2 +- - cts/scheduler/exp/notify-3.exp | 2 +- - cts/scheduler/exp/notify-behind-stopping-remote.exp | 2 +- - cts/scheduler/exp/novell-239079.exp | 2 +- - cts/scheduler/exp/novell-239082.exp | 2 +- - cts/scheduler/exp/novell-239087.exp | 2 +- - cts/scheduler/exp/novell-251689.exp | 2 +- - cts/scheduler/exp/novell-252693-2.exp | 2 +- - cts/scheduler/exp/novell-252693-3.exp | 2 +- - cts/scheduler/exp/novell-252693.exp | 2 +- - cts/scheduler/exp/nvpair-date-rules-1.exp | 2 +- - cts/scheduler/exp/nvpair-id-ref.exp | 2 +- - cts/scheduler/exp/obsolete-lrm-resource.exp | 2 +- - cts/scheduler/exp/ocf_degraded-remap-ocf_ok.exp | 2 +- - cts/scheduler/exp/ocf_degraded_promoted-remap-ocf_ok.exp | 2 +- - cts/scheduler/exp/on-fail-ignore.exp | 2 +- - cts/scheduler/exp/on_fail_demote1.exp | 2 +- - cts/scheduler/exp/on_fail_demote2.exp | 2 +- - cts/scheduler/exp/on_fail_demote3.exp | 2 +- - cts/scheduler/exp/on_fail_demote4.exp | 2 +- - cts/scheduler/exp/one-or-more-0.exp | 2 +- - cts/scheduler/exp/one-or-more-1.exp | 2 +- - cts/scheduler/exp/one-or-more-2.exp | 2 +- - cts/scheduler/exp/one-or-more-3.exp | 2 +- - cts/scheduler/exp/one-or-more-4.exp | 2 +- - cts/scheduler/exp/one-or-more-5.exp | 2 +- - cts/scheduler/exp/one-or-more-6.exp | 2 +- - cts/scheduler/exp/one-or-more-7.exp | 2 +- - cts/scheduler/exp/one-or-more-unrunnable-instances.exp | 2 +- - cts/scheduler/exp/op-defaults-2.exp | 2 +- - cts/scheduler/exp/op-defaults-3.exp | 2 +- - cts/scheduler/exp/op-defaults.exp | 2 +- - cts/scheduler/exp/order-clone.exp | 2 +- - cts/scheduler/exp/order-expired-failure.exp | 2 +- - cts/scheduler/exp/order-first-probes.exp | 2 +- - cts/scheduler/exp/order-mandatory.exp | 2 +- - cts/scheduler/exp/order-optional-keyword.exp | 2 +- - cts/scheduler/exp/order-optional.exp | 2 +- - cts/scheduler/exp/order-required.exp | 2 +- - cts/scheduler/exp/order-serialize-set.exp | 2 +- - cts/scheduler/exp/order-serialize.exp | 2 +- - cts/scheduler/exp/order-sets.exp | 2 +- - cts/scheduler/exp/order-wrong-kind.exp | 2 +- - cts/scheduler/exp/order1.exp | 2 +- - cts/scheduler/exp/order2.exp | 2 +- - cts/scheduler/exp/order3.exp | 2 +- - cts/scheduler/exp/order4.exp | 2 +- - cts/scheduler/exp/order5.exp | 2 +- - cts/scheduler/exp/order6.exp | 2 +- - cts/scheduler/exp/order7.exp | 2 +- - cts/scheduler/exp/order_constraint_stops_promoted.exp | 2 +- - cts/scheduler/exp/order_constraint_stops_unpromoted.exp | 2 +- - cts/scheduler/exp/ordered-set-basic-startup.exp | 2 +- - cts/scheduler/exp/ordered-set-natural.exp | 2 +- - cts/scheduler/exp/origin.exp | 2 +- - cts/scheduler/exp/orphan-0.exp | 2 +- - cts/scheduler/exp/orphan-1.exp | 2 +- - cts/scheduler/exp/orphan-2.exp | 2 +- - cts/scheduler/exp/params-0.exp | 2 +- - cts/scheduler/exp/params-1.exp | 2 +- - cts/scheduler/exp/params-2.exp | 2 +- - cts/scheduler/exp/params-3.exp | 2 +- - cts/scheduler/exp/params-4.exp | 2 +- - cts/scheduler/exp/params-5.exp | 2 +- - cts/scheduler/exp/params-6.exp | 2 +- - cts/scheduler/exp/partial-live-migration-multiple-active.exp | 2 +- - cts/scheduler/exp/partial-unmanaged-group.exp | 2 +- - cts/scheduler/exp/pending-node-no-uname.exp | 2 +- - cts/scheduler/exp/per-node-attrs.exp | 2 +- - cts/scheduler/exp/per-op-failcount.exp | 2 +- - cts/scheduler/exp/placement-capacity.exp | 2 +- - cts/scheduler/exp/placement-location.exp | 2 +- - cts/scheduler/exp/placement-priority.exp | 2 +- - cts/scheduler/exp/placement-stickiness.exp | 2 +- - cts/scheduler/exp/primitive-with-group-with-clone.exp | 2 +- - cts/scheduler/exp/primitive-with-group-with-promoted.exp | 2 +- - cts/scheduler/exp/primitive-with-unrunnable-group.exp | 2 +- - cts/scheduler/exp/priority-fencing-delay.exp | 2 +- - cts/scheduler/exp/probe-0.exp | 2 +- - cts/scheduler/exp/probe-1.exp | 2 +- - cts/scheduler/exp/probe-2.exp | 2 +- - cts/scheduler/exp/probe-3.exp | 2 +- - cts/scheduler/exp/probe-4.exp | 2 +- - cts/scheduler/exp/probe-pending-node.exp | 2 +- - cts/scheduler/exp/probe-target-of-failed-migrate_to-1.exp | 2 +- - cts/scheduler/exp/probe-target-of-failed-migrate_to-2.exp | 2 +- - cts/scheduler/exp/probe-timeout.exp | 2 +- - cts/scheduler/exp/promoted-0.exp | 2 +- - cts/scheduler/exp/promoted-1.exp | 2 +- - cts/scheduler/exp/promoted-10.exp | 2 +- - cts/scheduler/exp/promoted-11.exp | 2 +- - cts/scheduler/exp/promoted-12.exp | 2 +- - cts/scheduler/exp/promoted-13.exp | 2 +- - cts/scheduler/exp/promoted-2.exp | 2 +- - cts/scheduler/exp/promoted-3.exp | 2 +- - cts/scheduler/exp/promoted-4.exp | 2 +- - cts/scheduler/exp/promoted-5.exp | 2 +- - cts/scheduler/exp/promoted-6.exp | 2 +- - cts/scheduler/exp/promoted-7.exp | 2 +- - cts/scheduler/exp/promoted-8.exp | 2 +- - cts/scheduler/exp/promoted-9.exp | 2 +- - cts/scheduler/exp/promoted-allow-start.exp | 2 +- - cts/scheduler/exp/promoted-asymmetrical-order.exp | 2 +- - cts/scheduler/exp/promoted-colocation.exp | 2 +- - cts/scheduler/exp/promoted-demote-2.exp | 2 +- - cts/scheduler/exp/promoted-demote-block.exp | 2 +- - cts/scheduler/exp/promoted-demote.exp | 2 +- - cts/scheduler/exp/promoted-depend.exp | 2 +- - cts/scheduler/exp/promoted-dependent-ban.exp | 2 +- - cts/scheduler/exp/promoted-failed-demote-2.exp | 2 +- - cts/scheduler/exp/promoted-failed-demote.exp | 2 +- - cts/scheduler/exp/promoted-group.exp | 2 +- - cts/scheduler/exp/promoted-move.exp | 2 +- - cts/scheduler/exp/promoted-notify.exp | 2 +- - cts/scheduler/exp/promoted-ordering.exp | 2 +- - cts/scheduler/exp/promoted-partially-demoted-group.exp | 2 +- - cts/scheduler/exp/promoted-probed-score.exp | 2 +- - cts/scheduler/exp/promoted-promotion-constraint.exp | 2 +- - cts/scheduler/exp/promoted-pseudo.exp | 2 +- - cts/scheduler/exp/promoted-reattach.exp | 2 +- - cts/scheduler/exp/promoted-role.exp | 2 +- - cts/scheduler/exp/promoted-score-startup.exp | 2 +- - cts/scheduler/exp/promoted-stop.exp | 2 +- - cts/scheduler/exp/promoted-unmanaged-monitor.exp | 2 +- - cts/scheduler/exp/promoted-with-blocked.exp | 2 +- - cts/scheduler/exp/promoted_monitor_restart.exp | 2 +- - cts/scheduler/exp/quorum-1.exp | 2 +- - cts/scheduler/exp/quorum-2.exp | 2 +- - cts/scheduler/exp/quorum-3.exp | 2 +- - cts/scheduler/exp/quorum-4.exp | 2 +- - cts/scheduler/exp/quorum-5.exp | 2 +- - cts/scheduler/exp/quorum-6.exp | 2 +- - cts/scheduler/exp/rebalance-unique-clones.exp | 2 +- - cts/scheduler/exp/rec-node-1.exp | 2 +- - cts/scheduler/exp/rec-node-10.exp | 2 +- - cts/scheduler/exp/rec-node-11.exp | 2 +- - cts/scheduler/exp/rec-node-12.exp | 2 +- - cts/scheduler/exp/rec-node-13.exp | 2 +- - cts/scheduler/exp/rec-node-14.exp | 2 +- - cts/scheduler/exp/rec-node-15.exp | 2 +- - cts/scheduler/exp/rec-node-2.exp | 2 +- - cts/scheduler/exp/rec-node-3.exp | 2 +- - cts/scheduler/exp/rec-node-4.exp | 2 +- - cts/scheduler/exp/rec-node-5.exp | 2 +- - cts/scheduler/exp/rec-node-6.exp | 2 +- - cts/scheduler/exp/rec-node-7.exp | 2 +- - cts/scheduler/exp/rec-node-8.exp | 2 +- - cts/scheduler/exp/rec-node-9.exp | 2 +- - cts/scheduler/exp/rec-rsc-0.exp | 2 +- - cts/scheduler/exp/rec-rsc-1.exp | 2 +- - cts/scheduler/exp/rec-rsc-2.exp | 2 +- - cts/scheduler/exp/rec-rsc-3.exp | 2 +- - cts/scheduler/exp/rec-rsc-4.exp | 2 +- - cts/scheduler/exp/rec-rsc-5.exp | 2 +- - cts/scheduler/exp/rec-rsc-6.exp | 2 +- - cts/scheduler/exp/rec-rsc-7.exp | 2 +- - cts/scheduler/exp/rec-rsc-8.exp | 2 +- - cts/scheduler/exp/rec-rsc-9.exp | 2 +- - cts/scheduler/exp/reload-becomes-restart.exp | 2 +- - cts/scheduler/exp/remote-connection-shutdown.exp | 2 +- - cts/scheduler/exp/remote-connection-unrecoverable.exp | 2 +- - cts/scheduler/exp/remote-disable.exp | 2 +- - cts/scheduler/exp/remote-fence-before-reconnect.exp | 2 +- - cts/scheduler/exp/remote-fence-unclean-3.exp | 2 +- - cts/scheduler/exp/remote-fence-unclean.exp | 2 +- - cts/scheduler/exp/remote-fence-unclean2.exp | 2 +- - cts/scheduler/exp/remote-move.exp | 2 +- - cts/scheduler/exp/remote-orphaned.exp | 2 +- - cts/scheduler/exp/remote-orphaned2.exp | 2 +- - cts/scheduler/exp/remote-partial-migrate.exp | 2 +- - cts/scheduler/exp/remote-partial-migrate2.exp | 2 +- - cts/scheduler/exp/remote-probe-disable.exp | 2 +- - cts/scheduler/exp/remote-reconnect-delay.exp | 2 +- - cts/scheduler/exp/remote-recover-all.exp | 2 +- - cts/scheduler/exp/remote-recover-connection.exp | 2 +- - cts/scheduler/exp/remote-recover-fail.exp | 2 +- - cts/scheduler/exp/remote-recover-no-resources.exp | 2 +- - cts/scheduler/exp/remote-recover-unknown.exp | 2 +- - cts/scheduler/exp/remote-recover.exp | 2 +- - cts/scheduler/exp/remote-recovery.exp | 2 +- - cts/scheduler/exp/remote-stale-node-entry.exp | 2 +- - cts/scheduler/exp/remote-start-fail.exp | 2 +- - cts/scheduler/exp/remote-startup-probes.exp | 2 +- - cts/scheduler/exp/remote-startup.exp | 2 +- - cts/scheduler/exp/remote-unclean2.exp | 2 +- - cts/scheduler/exp/reprobe-target_rc.exp | 2 +- - cts/scheduler/exp/resource-discovery.exp | 2 +- - cts/scheduler/exp/restart-with-extra-op-params.exp | 2 +- - cts/scheduler/exp/route-remote-notify.exp | 2 +- - cts/scheduler/exp/rsc-defaults-2.exp | 2 +- - cts/scheduler/exp/rsc-defaults.exp | 2 +- - cts/scheduler/exp/rsc-discovery-per-node.exp | 2 +- - cts/scheduler/exp/rsc-maintenance.exp | 2 +- - cts/scheduler/exp/rsc-sets-clone-1.exp | 2 +- - cts/scheduler/exp/rsc-sets-clone.exp | 2 +- - cts/scheduler/exp/rsc-sets-promoted.exp | 2 +- - cts/scheduler/exp/rsc-sets-seq-false.exp | 2 +- - cts/scheduler/exp/rsc-sets-seq-true.exp | 2 +- - cts/scheduler/exp/rsc_dep1.exp | 2 +- - cts/scheduler/exp/rsc_dep10.exp | 2 +- - cts/scheduler/exp/rsc_dep2.exp | 2 +- - cts/scheduler/exp/rsc_dep3.exp | 2 +- - cts/scheduler/exp/rsc_dep4.exp | 2 +- - cts/scheduler/exp/rsc_dep5.exp | 2 +- - cts/scheduler/exp/rsc_dep7.exp | 2 +- - cts/scheduler/exp/rsc_dep8.exp | 2 +- - cts/scheduler/exp/rule-dbl-as-auto-number-match.exp | 2 +- - cts/scheduler/exp/rule-dbl-as-auto-number-no-match.exp | 2 +- - cts/scheduler/exp/rule-dbl-as-integer-match.exp | 2 +- - cts/scheduler/exp/rule-dbl-as-integer-no-match.exp | 2 +- - cts/scheduler/exp/rule-dbl-as-number-match.exp | 2 +- - cts/scheduler/exp/rule-dbl-as-number-no-match.exp | 2 +- - cts/scheduler/exp/rule-dbl-parse-fail-default-str-match.exp | 2 +- - cts/scheduler/exp/rule-dbl-parse-fail-default-str-no-match.exp | 2 +- - cts/scheduler/exp/rule-int-as-auto-integer-match.exp | 2 +- - cts/scheduler/exp/rule-int-as-auto-integer-no-match.exp | 2 +- - cts/scheduler/exp/rule-int-as-integer-match.exp | 2 +- - cts/scheduler/exp/rule-int-as-integer-no-match.exp | 2 +- - cts/scheduler/exp/rule-int-as-number-match.exp | 2 +- - cts/scheduler/exp/rule-int-as-number-no-match.exp | 2 +- - cts/scheduler/exp/rule-int-parse-fail-default-str-match.exp | 2 +- - cts/scheduler/exp/rule-int-parse-fail-default-str-no-match.exp | 2 +- - cts/scheduler/exp/shutdown-lock-expiration.exp | 2 +- - cts/scheduler/exp/shutdown-lock.exp | 2 +- - cts/scheduler/exp/shutdown-maintenance-node.exp | 2 +- - cts/scheduler/exp/simple1.exp | 2 +- - cts/scheduler/exp/simple11.exp | 2 +- - cts/scheduler/exp/simple12.exp | 2 +- - cts/scheduler/exp/simple2.exp | 2 +- - cts/scheduler/exp/simple3.exp | 2 +- - cts/scheduler/exp/simple4.exp | 2 +- - cts/scheduler/exp/simple6.exp | 2 +- - cts/scheduler/exp/simple7.exp | 2 +- - cts/scheduler/exp/simple8.exp | 2 +- - cts/scheduler/exp/site-specific-params.exp | 2 +- - cts/scheduler/exp/standby.exp | 2 +- - cts/scheduler/exp/start-then-stop-with-unfence.exp | 2 +- - cts/scheduler/exp/stonith-0.exp | 2 +- - cts/scheduler/exp/stonith-1.exp | 2 +- - cts/scheduler/exp/stonith-2.exp | 2 +- - cts/scheduler/exp/stonith-3.exp | 2 +- - cts/scheduler/exp/stonith-4.exp | 2 +- - cts/scheduler/exp/stop-all-resources.exp | 2 +- - cts/scheduler/exp/stop-failure-no-fencing.exp | 2 +- - cts/scheduler/exp/stop-failure-no-quorum.exp | 2 +- - cts/scheduler/exp/stop-failure-with-fencing.exp | 2 +- - cts/scheduler/exp/stop-unexpected-2.exp | 2 +- - cts/scheduler/exp/stop-unexpected.exp | 2 +- - cts/scheduler/exp/stopped-monitor-00.exp | 2 +- - cts/scheduler/exp/stopped-monitor-01.exp | 2 +- - cts/scheduler/exp/stopped-monitor-02.exp | 2 +- - cts/scheduler/exp/stopped-monitor-03.exp | 2 +- - cts/scheduler/exp/stopped-monitor-04.exp | 2 +- - cts/scheduler/exp/stopped-monitor-05.exp | 2 +- - cts/scheduler/exp/stopped-monitor-06.exp | 2 +- - cts/scheduler/exp/stopped-monitor-07.exp | 2 +- - cts/scheduler/exp/stopped-monitor-08.exp | 2 +- - cts/scheduler/exp/stopped-monitor-09.exp | 2 +- - cts/scheduler/exp/stopped-monitor-10.exp | 2 +- - cts/scheduler/exp/stopped-monitor-11.exp | 2 +- - cts/scheduler/exp/stopped-monitor-12.exp | 2 +- - cts/scheduler/exp/stopped-monitor-20.exp | 2 +- - cts/scheduler/exp/stopped-monitor-21.exp | 2 +- - cts/scheduler/exp/stopped-monitor-22.exp | 2 +- - cts/scheduler/exp/stopped-monitor-23.exp | 2 +- - cts/scheduler/exp/stopped-monitor-24.exp | 2 +- - cts/scheduler/exp/stopped-monitor-25.exp | 2 +- - cts/scheduler/exp/stopped-monitor-26.exp | 2 +- - cts/scheduler/exp/stopped-monitor-27.exp | 2 +- - cts/scheduler/exp/stopped-monitor-30.exp | 2 +- - cts/scheduler/exp/stopped-monitor-31.exp | 2 +- - cts/scheduler/exp/suicide-needed-inquorate.exp | 2 +- - cts/scheduler/exp/suicide-not-needed-initial-quorum.exp | 2 +- - cts/scheduler/exp/suicide-not-needed-never-quorate.exp | 2 +- - cts/scheduler/exp/suicide-not-needed-quorate.exp | 2 +- - cts/scheduler/exp/systemhealth1.exp | 2 +- - cts/scheduler/exp/systemhealth2.exp | 2 +- - cts/scheduler/exp/systemhealth3.exp | 2 +- - cts/scheduler/exp/systemhealthm1.exp | 2 +- - cts/scheduler/exp/systemhealthm2.exp | 2 +- - cts/scheduler/exp/systemhealthm3.exp | 2 +- - cts/scheduler/exp/systemhealthn1.exp | 2 +- - cts/scheduler/exp/systemhealthn2.exp | 2 +- - cts/scheduler/exp/systemhealthn3.exp | 2 +- - cts/scheduler/exp/systemhealtho1.exp | 2 +- - cts/scheduler/exp/systemhealtho2.exp | 2 +- - cts/scheduler/exp/systemhealtho3.exp | 2 +- - cts/scheduler/exp/systemhealthp1.exp | 2 +- - cts/scheduler/exp/systemhealthp2.exp | 2 +- - cts/scheduler/exp/systemhealthp3.exp | 2 +- - cts/scheduler/exp/tags-coloc-order-1.exp | 2 +- - cts/scheduler/exp/tags-coloc-order-2.exp | 2 +- - cts/scheduler/exp/tags-location.exp | 2 +- - cts/scheduler/exp/tags-ticket.exp | 2 +- - cts/scheduler/exp/target-0.exp | 2 +- - cts/scheduler/exp/target-1.exp | 2 +- - cts/scheduler/exp/target-2.exp | 2 +- - cts/scheduler/exp/template-1.exp | 2 +- - cts/scheduler/exp/template-2.exp | 2 +- - cts/scheduler/exp/template-3.exp | 2 +- - cts/scheduler/exp/template-clone-group.exp | 2 +- - cts/scheduler/exp/template-clone-primitive.exp | 2 +- - cts/scheduler/exp/template-coloc-1.exp | 2 +- - cts/scheduler/exp/template-coloc-2.exp | 2 +- - cts/scheduler/exp/template-coloc-3.exp | 2 +- - cts/scheduler/exp/template-order-1.exp | 2 +- - cts/scheduler/exp/template-order-2.exp | 2 +- - cts/scheduler/exp/template-order-3.exp | 2 +- - cts/scheduler/exp/template-rsc-sets-1.exp | 2 +- - cts/scheduler/exp/template-rsc-sets-2.exp | 2 +- - cts/scheduler/exp/template-rsc-sets-3.exp | 2 +- - cts/scheduler/exp/template-rsc-sets-4.exp | 2 +- - cts/scheduler/exp/template-ticket.exp | 2 +- - cts/scheduler/exp/ticket-clone-1.exp | 2 +- - cts/scheduler/exp/ticket-clone-10.exp | 2 +- - cts/scheduler/exp/ticket-clone-11.exp | 2 +- - cts/scheduler/exp/ticket-clone-12.exp | 2 +- - cts/scheduler/exp/ticket-clone-13.exp | 2 +- - cts/scheduler/exp/ticket-clone-14.exp | 2 +- - cts/scheduler/exp/ticket-clone-15.exp | 2 +- - cts/scheduler/exp/ticket-clone-16.exp | 2 +- - cts/scheduler/exp/ticket-clone-17.exp | 2 +- - cts/scheduler/exp/ticket-clone-18.exp | 2 +- - cts/scheduler/exp/ticket-clone-19.exp | 2 +- - cts/scheduler/exp/ticket-clone-2.exp | 2 +- - cts/scheduler/exp/ticket-clone-20.exp | 2 +- - cts/scheduler/exp/ticket-clone-21.exp | 2 +- - cts/scheduler/exp/ticket-clone-22.exp | 2 +- - cts/scheduler/exp/ticket-clone-23.exp | 2 +- - cts/scheduler/exp/ticket-clone-24.exp | 2 +- - cts/scheduler/exp/ticket-clone-3.exp | 2 +- - cts/scheduler/exp/ticket-clone-4.exp | 2 +- - cts/scheduler/exp/ticket-clone-5.exp | 2 +- - cts/scheduler/exp/ticket-clone-6.exp | 2 +- - cts/scheduler/exp/ticket-clone-7.exp | 2 +- - cts/scheduler/exp/ticket-clone-8.exp | 2 +- - cts/scheduler/exp/ticket-clone-9.exp | 2 +- - cts/scheduler/exp/ticket-group-1.exp | 2 +- - cts/scheduler/exp/ticket-group-10.exp | 2 +- - cts/scheduler/exp/ticket-group-11.exp | 2 +- - cts/scheduler/exp/ticket-group-12.exp | 2 +- - cts/scheduler/exp/ticket-group-13.exp | 2 +- - cts/scheduler/exp/ticket-group-14.exp | 2 +- - cts/scheduler/exp/ticket-group-15.exp | 2 +- - cts/scheduler/exp/ticket-group-16.exp | 2 +- - cts/scheduler/exp/ticket-group-17.exp | 2 +- - cts/scheduler/exp/ticket-group-18.exp | 2 +- - cts/scheduler/exp/ticket-group-19.exp | 2 +- - cts/scheduler/exp/ticket-group-2.exp | 2 +- - cts/scheduler/exp/ticket-group-20.exp | 2 +- - cts/scheduler/exp/ticket-group-21.exp | 2 +- - cts/scheduler/exp/ticket-group-22.exp | 2 +- - cts/scheduler/exp/ticket-group-23.exp | 2 +- - cts/scheduler/exp/ticket-group-24.exp | 2 +- - cts/scheduler/exp/ticket-group-3.exp | 2 +- - cts/scheduler/exp/ticket-group-4.exp | 2 +- - cts/scheduler/exp/ticket-group-5.exp | 2 +- - cts/scheduler/exp/ticket-group-6.exp | 2 +- - cts/scheduler/exp/ticket-group-7.exp | 2 +- - cts/scheduler/exp/ticket-group-8.exp | 2 +- - cts/scheduler/exp/ticket-group-9.exp | 2 +- - cts/scheduler/exp/ticket-primitive-1.exp | 2 +- - cts/scheduler/exp/ticket-primitive-10.exp | 2 +- - cts/scheduler/exp/ticket-primitive-11.exp | 2 +- - cts/scheduler/exp/ticket-primitive-12.exp | 2 +- - cts/scheduler/exp/ticket-primitive-13.exp | 2 +- - cts/scheduler/exp/ticket-primitive-14.exp | 2 +- - cts/scheduler/exp/ticket-primitive-15.exp | 2 +- - cts/scheduler/exp/ticket-primitive-16.exp | 2 +- - cts/scheduler/exp/ticket-primitive-17.exp | 2 +- - cts/scheduler/exp/ticket-primitive-18.exp | 2 +- - cts/scheduler/exp/ticket-primitive-19.exp | 2 +- - cts/scheduler/exp/ticket-primitive-2.exp | 2 +- - cts/scheduler/exp/ticket-primitive-20.exp | 2 +- - cts/scheduler/exp/ticket-primitive-21.exp | 2 +- - cts/scheduler/exp/ticket-primitive-22.exp | 2 +- - cts/scheduler/exp/ticket-primitive-23.exp | 2 +- - cts/scheduler/exp/ticket-primitive-24.exp | 2 +- - cts/scheduler/exp/ticket-primitive-3.exp | 2 +- - cts/scheduler/exp/ticket-primitive-4.exp | 2 +- - cts/scheduler/exp/ticket-primitive-5.exp | 2 +- - cts/scheduler/exp/ticket-primitive-6.exp | 2 +- - cts/scheduler/exp/ticket-primitive-7.exp | 2 +- - cts/scheduler/exp/ticket-primitive-8.exp | 2 +- - cts/scheduler/exp/ticket-primitive-9.exp | 2 +- - cts/scheduler/exp/ticket-promoted-1.exp | 2 +- - cts/scheduler/exp/ticket-promoted-10.exp | 2 +- - cts/scheduler/exp/ticket-promoted-11.exp | 2 +- - cts/scheduler/exp/ticket-promoted-12.exp | 2 +- - cts/scheduler/exp/ticket-promoted-13.exp | 2 +- - cts/scheduler/exp/ticket-promoted-14.exp | 2 +- - cts/scheduler/exp/ticket-promoted-15.exp | 2 +- - cts/scheduler/exp/ticket-promoted-16.exp | 2 +- - cts/scheduler/exp/ticket-promoted-17.exp | 2 +- - cts/scheduler/exp/ticket-promoted-18.exp | 2 +- - cts/scheduler/exp/ticket-promoted-19.exp | 2 +- - cts/scheduler/exp/ticket-promoted-2.exp | 2 +- - cts/scheduler/exp/ticket-promoted-20.exp | 2 +- - cts/scheduler/exp/ticket-promoted-21.exp | 2 +- - cts/scheduler/exp/ticket-promoted-22.exp | 2 +- - cts/scheduler/exp/ticket-promoted-23.exp | 2 +- - cts/scheduler/exp/ticket-promoted-24.exp | 2 +- - cts/scheduler/exp/ticket-promoted-3.exp | 2 +- - cts/scheduler/exp/ticket-promoted-4.exp | 2 +- - cts/scheduler/exp/ticket-promoted-5.exp | 2 +- - cts/scheduler/exp/ticket-promoted-6.exp | 2 +- - cts/scheduler/exp/ticket-promoted-7.exp | 2 +- - cts/scheduler/exp/ticket-promoted-8.exp | 2 +- - cts/scheduler/exp/ticket-promoted-9.exp | 2 +- - cts/scheduler/exp/ticket-rsc-sets-1.exp | 2 +- - cts/scheduler/exp/ticket-rsc-sets-10.exp | 2 +- - cts/scheduler/exp/ticket-rsc-sets-11.exp | 2 +- - cts/scheduler/exp/ticket-rsc-sets-12.exp | 2 +- - cts/scheduler/exp/ticket-rsc-sets-13.exp | 2 +- - cts/scheduler/exp/ticket-rsc-sets-14.exp | 2 +- - cts/scheduler/exp/ticket-rsc-sets-2.exp | 2 +- - cts/scheduler/exp/ticket-rsc-sets-3.exp | 2 +- - cts/scheduler/exp/ticket-rsc-sets-4.exp | 2 +- - cts/scheduler/exp/ticket-rsc-sets-5.exp | 2 +- - cts/scheduler/exp/ticket-rsc-sets-6.exp | 2 +- - cts/scheduler/exp/ticket-rsc-sets-7.exp | 2 +- - cts/scheduler/exp/ticket-rsc-sets-8.exp | 2 +- - cts/scheduler/exp/ticket-rsc-sets-9.exp | 2 +- - cts/scheduler/exp/timeout-by-node.exp | 2 +- - cts/scheduler/exp/unfence-definition.exp | 2 +- - cts/scheduler/exp/unfence-device.exp | 2 +- - cts/scheduler/exp/unfence-parameters.exp | 2 +- - cts/scheduler/exp/unfence-startup.exp | 2 +- - cts/scheduler/exp/unmanaged-block-restart.exp | 2 +- - cts/scheduler/exp/unmanaged-promoted.exp | 2 +- - cts/scheduler/exp/unmanaged-stop-1.exp | 2 +- - cts/scheduler/exp/unmanaged-stop-2.exp | 2 +- - cts/scheduler/exp/unmanaged-stop-3.exp | 2 +- - cts/scheduler/exp/unmanaged-stop-4.exp | 2 +- - cts/scheduler/exp/unrunnable-1.exp | 2 +- - cts/scheduler/exp/unrunnable-2.exp | 2 +- - cts/scheduler/exp/use-after-free-merge.exp | 2 +- - cts/scheduler/exp/utilization-check-allowed-nodes.exp | 2 +- - cts/scheduler/exp/utilization-complex.exp | 2 +- - cts/scheduler/exp/utilization-order1.exp | 2 +- - cts/scheduler/exp/utilization-order2.exp | 2 +- - cts/scheduler/exp/utilization-order3.exp | 2 +- - cts/scheduler/exp/utilization-order4.exp | 2 +- - cts/scheduler/exp/utilization-shuffle.exp | 2 +- - cts/scheduler/exp/utilization.exp | 2 +- - cts/scheduler/exp/value-source.exp | 2 +- - cts/scheduler/exp/whitebox-asymmetric.exp | 2 +- - cts/scheduler/exp/whitebox-fail1.exp | 2 +- - cts/scheduler/exp/whitebox-fail2.exp | 2 +- - cts/scheduler/exp/whitebox-fail3.exp | 2 +- - cts/scheduler/exp/whitebox-imply-stop-on-fence.exp | 2 +- - cts/scheduler/exp/whitebox-migrate1.exp | 2 +- - cts/scheduler/exp/whitebox-move.exp | 2 +- - cts/scheduler/exp/whitebox-ms-ordering-move.exp | 2 +- - cts/scheduler/exp/whitebox-ms-ordering.exp | 2 +- - cts/scheduler/exp/whitebox-nested-group.exp | 2 +- - cts/scheduler/exp/whitebox-orphan-ms.exp | 2 +- - cts/scheduler/exp/whitebox-orphaned.exp | 2 +- - cts/scheduler/exp/whitebox-start.exp | 2 +- - cts/scheduler/exp/whitebox-stop.exp | 2 +- - cts/scheduler/exp/whitebox-unexpectedly-running.exp | 2 +- - cts/scheduler/exp/year-2038.exp | 2 +- - 853 files changed, 853 insertions(+), 853 deletions(-) - -diff --git a/cts/scheduler/exp/1-a-then-bm-move-b.exp b/cts/scheduler/exp/1-a-then-bm-move-b.exp -index 8019a0349e..41e999f1ca 100644 ---- a/cts/scheduler/exp/1-a-then-bm-move-b.exp -+++ b/cts/scheduler/exp/1-a-then-bm-move-b.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/10-a-then-bm-b-move-a-clone.exp b/cts/scheduler/exp/10-a-then-bm-b-move-a-clone.exp -index 5cead0db32..3aa2b52780 100644 ---- a/cts/scheduler/exp/10-a-then-bm-b-move-a-clone.exp -+++ b/cts/scheduler/exp/10-a-then-bm-b-move-a-clone.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/11-a-then-bm-b-move-a-clone-starting.exp b/cts/scheduler/exp/11-a-then-bm-b-move-a-clone-starting.exp -index d3ce8b7ab7..275c836a89 100644 ---- a/cts/scheduler/exp/11-a-then-bm-b-move-a-clone-starting.exp -+++ b/cts/scheduler/exp/11-a-then-bm-b-move-a-clone-starting.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/1360.exp b/cts/scheduler/exp/1360.exp -index 3cb749f4e9..0053b7cd5f 100644 ---- a/cts/scheduler/exp/1360.exp -+++ b/cts/scheduler/exp/1360.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/1484.exp b/cts/scheduler/exp/1484.exp -index 00418383b0..c407e4e810 100644 ---- a/cts/scheduler/exp/1484.exp -+++ b/cts/scheduler/exp/1484.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/1494.exp b/cts/scheduler/exp/1494.exp -index 344c7c4226..46820f7493 100644 ---- a/cts/scheduler/exp/1494.exp -+++ b/cts/scheduler/exp/1494.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/2-am-then-b-move-a.exp b/cts/scheduler/exp/2-am-then-b-move-a.exp -index 25ecb631b9..68b14b45fc 100644 ---- a/cts/scheduler/exp/2-am-then-b-move-a.exp -+++ b/cts/scheduler/exp/2-am-then-b-move-a.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/3-am-then-bm-both-migrate.exp b/cts/scheduler/exp/3-am-then-bm-both-migrate.exp -index b3c065c63e..a8f78a041a 100644 ---- a/cts/scheduler/exp/3-am-then-bm-both-migrate.exp -+++ b/cts/scheduler/exp/3-am-then-bm-both-migrate.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/4-am-then-bm-b-not-migratable.exp b/cts/scheduler/exp/4-am-then-bm-b-not-migratable.exp -index 2edba79565..651010935e 100644 ---- a/cts/scheduler/exp/4-am-then-bm-b-not-migratable.exp -+++ b/cts/scheduler/exp/4-am-then-bm-b-not-migratable.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/5-am-then-bm-a-not-migratable.exp b/cts/scheduler/exp/5-am-then-bm-a-not-migratable.exp -index cf69cdbf27..97d5e544ca 100644 ---- a/cts/scheduler/exp/5-am-then-bm-a-not-migratable.exp -+++ b/cts/scheduler/exp/5-am-then-bm-a-not-migratable.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/594.exp b/cts/scheduler/exp/594.exp -index c0025f07a3..9dacf33d08 100644 ---- a/cts/scheduler/exp/594.exp -+++ b/cts/scheduler/exp/594.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/6-migrate-group.exp b/cts/scheduler/exp/6-migrate-group.exp -index 1b17af5bfe..d7bc544b43 100644 ---- a/cts/scheduler/exp/6-migrate-group.exp -+++ b/cts/scheduler/exp/6-migrate-group.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/662.exp b/cts/scheduler/exp/662.exp -index a5643a0d40..963f2fd258 100644 ---- a/cts/scheduler/exp/662.exp -+++ b/cts/scheduler/exp/662.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/696.exp b/cts/scheduler/exp/696.exp -index 8ba7058778..3cbdc860ea 100644 ---- a/cts/scheduler/exp/696.exp -+++ b/cts/scheduler/exp/696.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/7-migrate-group-one-unmigratable.exp b/cts/scheduler/exp/7-migrate-group-one-unmigratable.exp -index b1ad13fe61..c57edacfe7 100644 ---- a/cts/scheduler/exp/7-migrate-group-one-unmigratable.exp -+++ b/cts/scheduler/exp/7-migrate-group-one-unmigratable.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/726.exp b/cts/scheduler/exp/726.exp -index 46b2e6af8f..32eeaab085 100644 ---- a/cts/scheduler/exp/726.exp -+++ b/cts/scheduler/exp/726.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/735.exp b/cts/scheduler/exp/735.exp -index 54fe59cf90..13359db067 100644 ---- a/cts/scheduler/exp/735.exp -+++ b/cts/scheduler/exp/735.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/764.exp b/cts/scheduler/exp/764.exp -index f7a0ff82bd..0367776023 100644 ---- a/cts/scheduler/exp/764.exp -+++ b/cts/scheduler/exp/764.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/797.exp b/cts/scheduler/exp/797.exp -index f7d13a2770..d1e0de2ed0 100644 ---- a/cts/scheduler/exp/797.exp -+++ b/cts/scheduler/exp/797.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/8-am-then-bm-a-migrating-b-stopping.exp b/cts/scheduler/exp/8-am-then-bm-a-migrating-b-stopping.exp -index b236a17482..be7a5c0ad7 100644 ---- a/cts/scheduler/exp/8-am-then-bm-a-migrating-b-stopping.exp -+++ b/cts/scheduler/exp/8-am-then-bm-a-migrating-b-stopping.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/829.exp b/cts/scheduler/exp/829.exp -index 40be4f48dd..3eb01f3fed 100644 ---- a/cts/scheduler/exp/829.exp -+++ b/cts/scheduler/exp/829.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/9-am-then-bm-b-migrating-a-stopping.exp b/cts/scheduler/exp/9-am-then-bm-b-migrating-a-stopping.exp -index dd8db61d1a..7bcee2ec73 100644 ---- a/cts/scheduler/exp/9-am-then-bm-b-migrating-a-stopping.exp -+++ b/cts/scheduler/exp/9-am-then-bm-b-migrating-a-stopping.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/994-2.exp b/cts/scheduler/exp/994-2.exp -index 108e04cc11..c8108e9d18 100644 ---- a/cts/scheduler/exp/994-2.exp -+++ b/cts/scheduler/exp/994-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/994.exp b/cts/scheduler/exp/994.exp -index c6c6e5107b..a2bedd8c36 100644 ---- a/cts/scheduler/exp/994.exp -+++ b/cts/scheduler/exp/994.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/a-demote-then-b-migrate.exp b/cts/scheduler/exp/a-demote-then-b-migrate.exp -index a90db0572f..757149f93c 100644 ---- a/cts/scheduler/exp/a-demote-then-b-migrate.exp -+++ b/cts/scheduler/exp/a-demote-then-b-migrate.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/a-promote-then-b-migrate.exp b/cts/scheduler/exp/a-promote-then-b-migrate.exp -index 28de3e8455..bca053399f 100644 ---- a/cts/scheduler/exp/a-promote-then-b-migrate.exp -+++ b/cts/scheduler/exp/a-promote-then-b-migrate.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/allow-unhealthy-nodes.exp b/cts/scheduler/exp/allow-unhealthy-nodes.exp -index 9fc5aab67a..12563e4301 100644 ---- a/cts/scheduler/exp/allow-unhealthy-nodes.exp -+++ b/cts/scheduler/exp/allow-unhealthy-nodes.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/anon-instance-pending.exp b/cts/scheduler/exp/anon-instance-pending.exp -index dee6772b51..3acba37c55 100644 ---- a/cts/scheduler/exp/anon-instance-pending.exp -+++ b/cts/scheduler/exp/anon-instance-pending.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/anti-colocation-order.exp b/cts/scheduler/exp/anti-colocation-order.exp -index d1c2d05bad..a366de586c 100644 ---- a/cts/scheduler/exp/anti-colocation-order.exp -+++ b/cts/scheduler/exp/anti-colocation-order.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/anti-colocation-promoted.exp b/cts/scheduler/exp/anti-colocation-promoted.exp -index 52d44bff83..68272959b7 100644 ---- a/cts/scheduler/exp/anti-colocation-promoted.exp -+++ b/cts/scheduler/exp/anti-colocation-promoted.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/anti-colocation-unpromoted.exp b/cts/scheduler/exp/anti-colocation-unpromoted.exp -index f3e49bf5d4..8cf270e366 100644 ---- a/cts/scheduler/exp/anti-colocation-unpromoted.exp -+++ b/cts/scheduler/exp/anti-colocation-unpromoted.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/asymmetric.exp b/cts/scheduler/exp/asymmetric.exp -index 3277f70a90..27ea8c562b 100644 ---- a/cts/scheduler/exp/asymmetric.exp -+++ b/cts/scheduler/exp/asymmetric.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/asymmetrical-order-move.exp b/cts/scheduler/exp/asymmetrical-order-move.exp -index afa55001ba..e54259f0fd 100644 ---- a/cts/scheduler/exp/asymmetrical-order-move.exp -+++ b/cts/scheduler/exp/asymmetrical-order-move.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/asymmetrical-order-restart.exp b/cts/scheduler/exp/asymmetrical-order-restart.exp -index c0b627a95a..c1fbdb7e8d 100644 ---- a/cts/scheduler/exp/asymmetrical-order-restart.exp -+++ b/cts/scheduler/exp/asymmetrical-order-restart.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/attrs1.exp b/cts/scheduler/exp/attrs1.exp -index 17a700975a..4c903c58de 100644 ---- a/cts/scheduler/exp/attrs1.exp -+++ b/cts/scheduler/exp/attrs1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/attrs2.exp b/cts/scheduler/exp/attrs2.exp -index 17a700975a..4c903c58de 100644 ---- a/cts/scheduler/exp/attrs2.exp -+++ b/cts/scheduler/exp/attrs2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/attrs3.exp b/cts/scheduler/exp/attrs3.exp -index 367ce6eba2..4050f8ac2f 100644 ---- a/cts/scheduler/exp/attrs3.exp -+++ b/cts/scheduler/exp/attrs3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/attrs4.exp b/cts/scheduler/exp/attrs4.exp -index 367ce6eba2..4050f8ac2f 100644 ---- a/cts/scheduler/exp/attrs4.exp -+++ b/cts/scheduler/exp/attrs4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/attrs5.exp b/cts/scheduler/exp/attrs5.exp -index 64e9955cd7..97d66e7e91 100644 ---- a/cts/scheduler/exp/attrs5.exp -+++ b/cts/scheduler/exp/attrs5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/attrs6.exp b/cts/scheduler/exp/attrs6.exp -index 367ce6eba2..4050f8ac2f 100644 ---- a/cts/scheduler/exp/attrs6.exp -+++ b/cts/scheduler/exp/attrs6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/attrs7.exp b/cts/scheduler/exp/attrs7.exp -index 17a700975a..4c903c58de 100644 ---- a/cts/scheduler/exp/attrs7.exp -+++ b/cts/scheduler/exp/attrs7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/attrs8.exp b/cts/scheduler/exp/attrs8.exp -index 17a700975a..4c903c58de 100644 ---- a/cts/scheduler/exp/attrs8.exp -+++ b/cts/scheduler/exp/attrs8.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/balanced.exp b/cts/scheduler/exp/balanced.exp -index cd10d895f8..ebcbcb2f05 100644 ---- a/cts/scheduler/exp/balanced.exp -+++ b/cts/scheduler/exp/balanced.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/banned-group-inner-constraints.exp b/cts/scheduler/exp/banned-group-inner-constraints.exp -index 84ccb51ed9..777f87857b 100644 ---- a/cts/scheduler/exp/banned-group-inner-constraints.exp -+++ b/cts/scheduler/exp/banned-group-inner-constraints.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/base-score.exp b/cts/scheduler/exp/base-score.exp -index 9bf5c2d687..7af6152c4c 100644 ---- a/cts/scheduler/exp/base-score.exp -+++ b/cts/scheduler/exp/base-score.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bnc-515172.exp b/cts/scheduler/exp/bnc-515172.exp -index 596c060f2a..5d3167b255 100644 ---- a/cts/scheduler/exp/bnc-515172.exp -+++ b/cts/scheduler/exp/bnc-515172.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-1572-1.exp b/cts/scheduler/exp/bug-1572-1.exp -index 0639f52300..a5c7466ae7 100644 ---- a/cts/scheduler/exp/bug-1572-1.exp -+++ b/cts/scheduler/exp/bug-1572-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-1572-2.exp b/cts/scheduler/exp/bug-1572-2.exp -index 7c30eaf28b..23db4878f8 100644 ---- a/cts/scheduler/exp/bug-1572-2.exp -+++ b/cts/scheduler/exp/bug-1572-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-1573.exp b/cts/scheduler/exp/bug-1573.exp -index 2f90fb1579..f8ad05a705 100644 ---- a/cts/scheduler/exp/bug-1573.exp -+++ b/cts/scheduler/exp/bug-1573.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-1685.exp b/cts/scheduler/exp/bug-1685.exp -index b8634e349c..590145974f 100644 ---- a/cts/scheduler/exp/bug-1685.exp -+++ b/cts/scheduler/exp/bug-1685.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-1718.exp b/cts/scheduler/exp/bug-1718.exp -index f55104d589..d8e5cda2af 100644 ---- a/cts/scheduler/exp/bug-1718.exp -+++ b/cts/scheduler/exp/bug-1718.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-1765.exp b/cts/scheduler/exp/bug-1765.exp -index eda2dcb3c4..42de909204 100644 ---- a/cts/scheduler/exp/bug-1765.exp -+++ b/cts/scheduler/exp/bug-1765.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-1820-1.exp b/cts/scheduler/exp/bug-1820-1.exp -index 6210740a1b..8aa14a3a89 100644 ---- a/cts/scheduler/exp/bug-1820-1.exp -+++ b/cts/scheduler/exp/bug-1820-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-1820.exp b/cts/scheduler/exp/bug-1820.exp -index a7b8b5b184..f6a3da48ca 100644 ---- a/cts/scheduler/exp/bug-1820.exp -+++ b/cts/scheduler/exp/bug-1820.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-1822.exp b/cts/scheduler/exp/bug-1822.exp -index 9960c68daa..a7b50aac25 100644 ---- a/cts/scheduler/exp/bug-1822.exp -+++ b/cts/scheduler/exp/bug-1822.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5014-A-start-B-start.exp b/cts/scheduler/exp/bug-5014-A-start-B-start.exp -index d375e7abcb..852761631d 100644 ---- a/cts/scheduler/exp/bug-5014-A-start-B-start.exp -+++ b/cts/scheduler/exp/bug-5014-A-start-B-start.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5014-A-stop-B-started.exp b/cts/scheduler/exp/bug-5014-A-stop-B-started.exp -index 4c15e227bd..833ad919bb 100644 ---- a/cts/scheduler/exp/bug-5014-A-stop-B-started.exp -+++ b/cts/scheduler/exp/bug-5014-A-stop-B-started.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5014-A-stopped-B-stopped.exp b/cts/scheduler/exp/bug-5014-A-stopped-B-stopped.exp -index 5549ff8fe9..92d93dc8b6 100644 ---- a/cts/scheduler/exp/bug-5014-A-stopped-B-stopped.exp -+++ b/cts/scheduler/exp/bug-5014-A-stopped-B-stopped.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5014-CLONE-A-start-B-start.exp b/cts/scheduler/exp/bug-5014-CLONE-A-start-B-start.exp -index dd18da5c0d..8d44fee058 100644 ---- a/cts/scheduler/exp/bug-5014-CLONE-A-start-B-start.exp -+++ b/cts/scheduler/exp/bug-5014-CLONE-A-start-B-start.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5014-CLONE-A-stop-B-started.exp b/cts/scheduler/exp/bug-5014-CLONE-A-stop-B-started.exp -index 25cab0a21c..ef5b8d4753 100644 ---- a/cts/scheduler/exp/bug-5014-CLONE-A-stop-B-started.exp -+++ b/cts/scheduler/exp/bug-5014-CLONE-A-stop-B-started.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5014-CthenAthenB-C-stopped.exp b/cts/scheduler/exp/bug-5014-CthenAthenB-C-stopped.exp -index 42e829d112..b5c21abd9a 100644 ---- a/cts/scheduler/exp/bug-5014-CthenAthenB-C-stopped.exp -+++ b/cts/scheduler/exp/bug-5014-CthenAthenB-C-stopped.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5014-GROUP-A-start-B-start.exp b/cts/scheduler/exp/bug-5014-GROUP-A-start-B-start.exp -index 49c1a11eac..bd37f09957 100644 ---- a/cts/scheduler/exp/bug-5014-GROUP-A-start-B-start.exp -+++ b/cts/scheduler/exp/bug-5014-GROUP-A-start-B-start.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5014-GROUP-A-stopped-B-started.exp b/cts/scheduler/exp/bug-5014-GROUP-A-stopped-B-started.exp -index 03a0a35010..cc3a87e448 100644 ---- a/cts/scheduler/exp/bug-5014-GROUP-A-stopped-B-started.exp -+++ b/cts/scheduler/exp/bug-5014-GROUP-A-stopped-B-started.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5014-GROUP-A-stopped-B-stopped.exp b/cts/scheduler/exp/bug-5014-GROUP-A-stopped-B-stopped.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/bug-5014-GROUP-A-stopped-B-stopped.exp -+++ b/cts/scheduler/exp/bug-5014-GROUP-A-stopped-B-stopped.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/bug-5014-ordered-set-symmetrical-false.exp b/cts/scheduler/exp/bug-5014-ordered-set-symmetrical-false.exp -index 679a30ffac..718d909cb6 100644 ---- a/cts/scheduler/exp/bug-5014-ordered-set-symmetrical-false.exp -+++ b/cts/scheduler/exp/bug-5014-ordered-set-symmetrical-false.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5014-ordered-set-symmetrical-true.exp b/cts/scheduler/exp/bug-5014-ordered-set-symmetrical-true.exp -index ab0957e4e5..bfd0a8a5f7 100644 ---- a/cts/scheduler/exp/bug-5014-ordered-set-symmetrical-true.exp -+++ b/cts/scheduler/exp/bug-5014-ordered-set-symmetrical-true.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5025-1.exp b/cts/scheduler/exp/bug-5025-1.exp -index c81d8bf00c..546d49b432 100644 ---- a/cts/scheduler/exp/bug-5025-1.exp -+++ b/cts/scheduler/exp/bug-5025-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5025-2.exp b/cts/scheduler/exp/bug-5025-2.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/bug-5025-2.exp -+++ b/cts/scheduler/exp/bug-5025-2.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/bug-5025-3.exp b/cts/scheduler/exp/bug-5025-3.exp -index 064843b098..da6ed8467d 100644 ---- a/cts/scheduler/exp/bug-5025-3.exp -+++ b/cts/scheduler/exp/bug-5025-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5025-4.exp b/cts/scheduler/exp/bug-5025-4.exp -index 61ea8a4ca9..0571d54801 100644 ---- a/cts/scheduler/exp/bug-5025-4.exp -+++ b/cts/scheduler/exp/bug-5025-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5028-bottom.exp b/cts/scheduler/exp/bug-5028-bottom.exp -index f3d8b1d8a6..3545c1a013 100644 ---- a/cts/scheduler/exp/bug-5028-bottom.exp -+++ b/cts/scheduler/exp/bug-5028-bottom.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5028-detach.exp b/cts/scheduler/exp/bug-5028-detach.exp -index 9f9df5ecfc..bdc01de568 100644 ---- a/cts/scheduler/exp/bug-5028-detach.exp -+++ b/cts/scheduler/exp/bug-5028-detach.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5028.exp b/cts/scheduler/exp/bug-5028.exp -index 7b0308e2d8..066d7077ef 100644 ---- a/cts/scheduler/exp/bug-5028.exp -+++ b/cts/scheduler/exp/bug-5028.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5038.exp b/cts/scheduler/exp/bug-5038.exp -index 915363575f..122415b7ce 100644 ---- a/cts/scheduler/exp/bug-5038.exp -+++ b/cts/scheduler/exp/bug-5038.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/bug-5059.exp b/cts/scheduler/exp/bug-5059.exp -index a234f566b4..343f8cf0ab 100644 ---- a/cts/scheduler/exp/bug-5059.exp -+++ b/cts/scheduler/exp/bug-5059.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5069-op-disabled.exp b/cts/scheduler/exp/bug-5069-op-disabled.exp -index c60abe6c7d..94e2980889 100644 ---- a/cts/scheduler/exp/bug-5069-op-disabled.exp -+++ b/cts/scheduler/exp/bug-5069-op-disabled.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5069-op-enabled.exp b/cts/scheduler/exp/bug-5069-op-enabled.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/bug-5069-op-enabled.exp -+++ b/cts/scheduler/exp/bug-5069-op-enabled.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/bug-5140-require-all-false.exp b/cts/scheduler/exp/bug-5140-require-all-false.exp -index dcd32ea9e6..381ecbca44 100644 ---- a/cts/scheduler/exp/bug-5140-require-all-false.exp -+++ b/cts/scheduler/exp/bug-5140-require-all-false.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5143-ms-shuffle.exp b/cts/scheduler/exp/bug-5143-ms-shuffle.exp -index 1cbf828eb5..46454ca3c5 100644 ---- a/cts/scheduler/exp/bug-5143-ms-shuffle.exp -+++ b/cts/scheduler/exp/bug-5143-ms-shuffle.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-5186-partial-migrate.exp b/cts/scheduler/exp/bug-5186-partial-migrate.exp -index f88e573ec3..ec5ed5e9ec 100644 ---- a/cts/scheduler/exp/bug-5186-partial-migrate.exp -+++ b/cts/scheduler/exp/bug-5186-partial-migrate.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-cl-5168.exp b/cts/scheduler/exp/bug-cl-5168.exp -index 7a303757a6..7e9b39f8b1 100644 ---- a/cts/scheduler/exp/bug-cl-5168.exp -+++ b/cts/scheduler/exp/bug-cl-5168.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-cl-5170.exp b/cts/scheduler/exp/bug-cl-5170.exp -index 3e1c8c15e4..13a8bfcdcc 100644 ---- a/cts/scheduler/exp/bug-cl-5170.exp -+++ b/cts/scheduler/exp/bug-cl-5170.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-cl-5212.exp b/cts/scheduler/exp/bug-cl-5212.exp -index 8a2e1833d8..e64c0c6bde 100644 ---- a/cts/scheduler/exp/bug-cl-5212.exp -+++ b/cts/scheduler/exp/bug-cl-5212.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-cl-5213.exp b/cts/scheduler/exp/bug-cl-5213.exp -index d685dd790e..d12aa53a5b 100644 ---- a/cts/scheduler/exp/bug-cl-5213.exp -+++ b/cts/scheduler/exp/bug-cl-5213.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-cl-5219.exp b/cts/scheduler/exp/bug-cl-5219.exp -index 1545cd9a9a..f9d23db9d5 100644 ---- a/cts/scheduler/exp/bug-cl-5219.exp -+++ b/cts/scheduler/exp/bug-cl-5219.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-cl-5247.exp b/cts/scheduler/exp/bug-cl-5247.exp -index 1f5c7f6a99..68cbf7bbea 100644 ---- a/cts/scheduler/exp/bug-cl-5247.exp -+++ b/cts/scheduler/exp/bug-cl-5247.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-1852.exp b/cts/scheduler/exp/bug-lf-1852.exp -index 33950152f1..f0aa514b1d 100644 ---- a/cts/scheduler/exp/bug-lf-1852.exp -+++ b/cts/scheduler/exp/bug-lf-1852.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-1920.exp b/cts/scheduler/exp/bug-lf-1920.exp -index 06a4bfff2e..4110db72d4 100644 ---- a/cts/scheduler/exp/bug-lf-1920.exp -+++ b/cts/scheduler/exp/bug-lf-1920.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2106.exp b/cts/scheduler/exp/bug-lf-2106.exp -index c753ab05fb..acd025ce9e 100644 ---- a/cts/scheduler/exp/bug-lf-2106.exp -+++ b/cts/scheduler/exp/bug-lf-2106.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2153.exp b/cts/scheduler/exp/bug-lf-2153.exp -index 987b52e20c..c7c0f1cbda 100644 ---- a/cts/scheduler/exp/bug-lf-2153.exp -+++ b/cts/scheduler/exp/bug-lf-2153.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2160.exp b/cts/scheduler/exp/bug-lf-2160.exp -index fc36e0d0e4..2e92c11892 100644 ---- a/cts/scheduler/exp/bug-lf-2160.exp -+++ b/cts/scheduler/exp/bug-lf-2160.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2171.exp b/cts/scheduler/exp/bug-lf-2171.exp -index d922b0d13d..9fe68ca765 100644 ---- a/cts/scheduler/exp/bug-lf-2171.exp -+++ b/cts/scheduler/exp/bug-lf-2171.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2213.exp b/cts/scheduler/exp/bug-lf-2213.exp -index 3537883c0d..d594b41480 100644 ---- a/cts/scheduler/exp/bug-lf-2213.exp -+++ b/cts/scheduler/exp/bug-lf-2213.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2317.exp b/cts/scheduler/exp/bug-lf-2317.exp -index a357227478..b9f0c8aad7 100644 ---- a/cts/scheduler/exp/bug-lf-2317.exp -+++ b/cts/scheduler/exp/bug-lf-2317.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2358.exp b/cts/scheduler/exp/bug-lf-2358.exp -index e14a80a7ac..0fadc23517 100644 ---- a/cts/scheduler/exp/bug-lf-2358.exp -+++ b/cts/scheduler/exp/bug-lf-2358.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2361.exp b/cts/scheduler/exp/bug-lf-2361.exp -index 9369be1e6c..0a7c96d8a0 100644 ---- a/cts/scheduler/exp/bug-lf-2361.exp -+++ b/cts/scheduler/exp/bug-lf-2361.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2422.exp b/cts/scheduler/exp/bug-lf-2422.exp -index 4728c2499c..3cc639391e 100644 ---- a/cts/scheduler/exp/bug-lf-2422.exp -+++ b/cts/scheduler/exp/bug-lf-2422.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2435.exp b/cts/scheduler/exp/bug-lf-2435.exp -index 69a4a18bd5..2038e8222d 100644 ---- a/cts/scheduler/exp/bug-lf-2435.exp -+++ b/cts/scheduler/exp/bug-lf-2435.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2445.exp b/cts/scheduler/exp/bug-lf-2445.exp -index 7ea6185706..278af704a2 100644 ---- a/cts/scheduler/exp/bug-lf-2445.exp -+++ b/cts/scheduler/exp/bug-lf-2445.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2453.exp b/cts/scheduler/exp/bug-lf-2453.exp -index 83ef6c7f5f..732739a200 100644 ---- a/cts/scheduler/exp/bug-lf-2453.exp -+++ b/cts/scheduler/exp/bug-lf-2453.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2474.exp b/cts/scheduler/exp/bug-lf-2474.exp -index ef56fba593..da44a71d6c 100644 ---- a/cts/scheduler/exp/bug-lf-2474.exp -+++ b/cts/scheduler/exp/bug-lf-2474.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2493.exp b/cts/scheduler/exp/bug-lf-2493.exp -index 6c55e2690d..af2a891d91 100644 ---- a/cts/scheduler/exp/bug-lf-2493.exp -+++ b/cts/scheduler/exp/bug-lf-2493.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2508.exp b/cts/scheduler/exp/bug-lf-2508.exp -index a49e319910..c73379b979 100644 ---- a/cts/scheduler/exp/bug-lf-2508.exp -+++ b/cts/scheduler/exp/bug-lf-2508.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2544.exp b/cts/scheduler/exp/bug-lf-2544.exp -index 114bd3ec40..e0193609d3 100644 ---- a/cts/scheduler/exp/bug-lf-2544.exp -+++ b/cts/scheduler/exp/bug-lf-2544.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2551.exp b/cts/scheduler/exp/bug-lf-2551.exp -index b02de4cc28..c08d486d95 100644 ---- a/cts/scheduler/exp/bug-lf-2551.exp -+++ b/cts/scheduler/exp/bug-lf-2551.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2574.exp b/cts/scheduler/exp/bug-lf-2574.exp -index 726e0c0cd9..7fb6327e27 100644 ---- a/cts/scheduler/exp/bug-lf-2574.exp -+++ b/cts/scheduler/exp/bug-lf-2574.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2581.exp b/cts/scheduler/exp/bug-lf-2581.exp -index a920d32520..6a7c653bc3 100644 ---- a/cts/scheduler/exp/bug-lf-2581.exp -+++ b/cts/scheduler/exp/bug-lf-2581.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2606.exp b/cts/scheduler/exp/bug-lf-2606.exp -index 448a7ace68..06a1dbf82d 100644 ---- a/cts/scheduler/exp/bug-lf-2606.exp -+++ b/cts/scheduler/exp/bug-lf-2606.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-lf-2619.exp b/cts/scheduler/exp/bug-lf-2619.exp -index c454c3e768..3ec39fd64e 100644 ---- a/cts/scheduler/exp/bug-lf-2619.exp -+++ b/cts/scheduler/exp/bug-lf-2619.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-n-385265-2.exp b/cts/scheduler/exp/bug-n-385265-2.exp -index 216c309df3..d7f917072f 100644 ---- a/cts/scheduler/exp/bug-n-385265-2.exp -+++ b/cts/scheduler/exp/bug-n-385265-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-n-385265.exp b/cts/scheduler/exp/bug-n-385265.exp -index eed4bb95c0..28b9d22188 100644 ---- a/cts/scheduler/exp/bug-n-385265.exp -+++ b/cts/scheduler/exp/bug-n-385265.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-n-387749.exp b/cts/scheduler/exp/bug-n-387749.exp -index 2b300ee08a..27a9ab5a9d 100644 ---- a/cts/scheduler/exp/bug-n-387749.exp -+++ b/cts/scheduler/exp/bug-n-387749.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-pm-11.exp b/cts/scheduler/exp/bug-pm-11.exp -index aa5d61fee0..b1354438f5 100644 ---- a/cts/scheduler/exp/bug-pm-11.exp -+++ b/cts/scheduler/exp/bug-pm-11.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-pm-12.exp b/cts/scheduler/exp/bug-pm-12.exp -index 4d15a6f78f..3b16119b82 100644 ---- a/cts/scheduler/exp/bug-pm-12.exp -+++ b/cts/scheduler/exp/bug-pm-12.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-rh-1097457.exp b/cts/scheduler/exp/bug-rh-1097457.exp -index 0f60fa62b7..ef5c24d2a0 100644 ---- a/cts/scheduler/exp/bug-rh-1097457.exp -+++ b/cts/scheduler/exp/bug-rh-1097457.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-rh-880249.exp b/cts/scheduler/exp/bug-rh-880249.exp -index 7f12b98093..b6bf597ead 100644 ---- a/cts/scheduler/exp/bug-rh-880249.exp -+++ b/cts/scheduler/exp/bug-rh-880249.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bug-suse-707150.exp b/cts/scheduler/exp/bug-suse-707150.exp -index c66c32fb3a..153f112693 100644 ---- a/cts/scheduler/exp/bug-suse-707150.exp -+++ b/cts/scheduler/exp/bug-suse-707150.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-connection-with-container.exp b/cts/scheduler/exp/bundle-connection-with-container.exp -index ff1c8f016d..d41f9ce3c6 100644 ---- a/cts/scheduler/exp/bundle-connection-with-container.exp -+++ b/cts/scheduler/exp/bundle-connection-with-container.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-interleave-promote.exp b/cts/scheduler/exp/bundle-interleave-promote.exp -index 3a3252adda..399a6b3898 100644 ---- a/cts/scheduler/exp/bundle-interleave-promote.exp -+++ b/cts/scheduler/exp/bundle-interleave-promote.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-interleave-start.exp b/cts/scheduler/exp/bundle-interleave-start.exp -index 4f726cd82f..7b71469bc8 100644 ---- a/cts/scheduler/exp/bundle-interleave-start.exp -+++ b/cts/scheduler/exp/bundle-interleave-start.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-nested-colocation.exp b/cts/scheduler/exp/bundle-nested-colocation.exp -index ec7a71ff69..77f3eaf145 100644 ---- a/cts/scheduler/exp/bundle-nested-colocation.exp -+++ b/cts/scheduler/exp/bundle-nested-colocation.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-order-fencing.exp b/cts/scheduler/exp/bundle-order-fencing.exp -index a47bd4f4e0..c39583cead 100644 ---- a/cts/scheduler/exp/bundle-order-fencing.exp -+++ b/cts/scheduler/exp/bundle-order-fencing.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-order-partial-start-2.exp b/cts/scheduler/exp/bundle-order-partial-start-2.exp -index fc8a148a83..54b4676e22 100644 ---- a/cts/scheduler/exp/bundle-order-partial-start-2.exp -+++ b/cts/scheduler/exp/bundle-order-partial-start-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-order-partial-start.exp b/cts/scheduler/exp/bundle-order-partial-start.exp -index 2f4d0b8b24..bafae33bc3 100644 ---- a/cts/scheduler/exp/bundle-order-partial-start.exp -+++ b/cts/scheduler/exp/bundle-order-partial-start.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-order-partial-stop.exp b/cts/scheduler/exp/bundle-order-partial-stop.exp -index 4b85ab5493..a79b2fce73 100644 ---- a/cts/scheduler/exp/bundle-order-partial-stop.exp -+++ b/cts/scheduler/exp/bundle-order-partial-stop.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-order-startup-clone-2.exp b/cts/scheduler/exp/bundle-order-startup-clone-2.exp -index e4a35c7583..ec1b0dda8b 100644 ---- a/cts/scheduler/exp/bundle-order-startup-clone-2.exp -+++ b/cts/scheduler/exp/bundle-order-startup-clone-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-order-startup-clone.exp b/cts/scheduler/exp/bundle-order-startup-clone.exp -index e479a6ebe5..d8b572768f 100644 ---- a/cts/scheduler/exp/bundle-order-startup-clone.exp -+++ b/cts/scheduler/exp/bundle-order-startup-clone.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-order-startup.exp b/cts/scheduler/exp/bundle-order-startup.exp -index 51970ed8b6..ba9a48e394 100644 ---- a/cts/scheduler/exp/bundle-order-startup.exp -+++ b/cts/scheduler/exp/bundle-order-startup.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-order-stop-clone.exp b/cts/scheduler/exp/bundle-order-stop-clone.exp -index f6981e7ef5..43fb588cc5 100644 ---- a/cts/scheduler/exp/bundle-order-stop-clone.exp -+++ b/cts/scheduler/exp/bundle-order-stop-clone.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-order-stop-on-remote.exp b/cts/scheduler/exp/bundle-order-stop-on-remote.exp -index 11ec5575a4..a4cae1ad85 100644 ---- a/cts/scheduler/exp/bundle-order-stop-on-remote.exp -+++ b/cts/scheduler/exp/bundle-order-stop-on-remote.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-order-stop.exp b/cts/scheduler/exp/bundle-order-stop.exp -index 4b85ab5493..a79b2fce73 100644 ---- a/cts/scheduler/exp/bundle-order-stop.exp -+++ b/cts/scheduler/exp/bundle-order-stop.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-probe-order-1.exp b/cts/scheduler/exp/bundle-probe-order-1.exp -index e5f2a9b28b..8b933e25d1 100644 ---- a/cts/scheduler/exp/bundle-probe-order-1.exp -+++ b/cts/scheduler/exp/bundle-probe-order-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-probe-order-2.exp b/cts/scheduler/exp/bundle-probe-order-2.exp -index 5b280508da..9aeb160110 100644 ---- a/cts/scheduler/exp/bundle-probe-order-2.exp -+++ b/cts/scheduler/exp/bundle-probe-order-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-probe-order-3.exp b/cts/scheduler/exp/bundle-probe-order-3.exp -index 69140a4184..dcd7734c18 100644 ---- a/cts/scheduler/exp/bundle-probe-order-3.exp -+++ b/cts/scheduler/exp/bundle-probe-order-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-probe-remotes.exp b/cts/scheduler/exp/bundle-probe-remotes.exp -index 41a6cf134c..1fa6362fcd 100644 ---- a/cts/scheduler/exp/bundle-probe-remotes.exp -+++ b/cts/scheduler/exp/bundle-probe-remotes.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-promoted-anticolocation-1.exp b/cts/scheduler/exp/bundle-promoted-anticolocation-1.exp -index bb2aee15a3..6cd6b9837d 100644 ---- a/cts/scheduler/exp/bundle-promoted-anticolocation-1.exp -+++ b/cts/scheduler/exp/bundle-promoted-anticolocation-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-promoted-anticolocation-2.exp b/cts/scheduler/exp/bundle-promoted-anticolocation-2.exp -index bb2aee15a3..6cd6b9837d 100644 ---- a/cts/scheduler/exp/bundle-promoted-anticolocation-2.exp -+++ b/cts/scheduler/exp/bundle-promoted-anticolocation-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-promoted-anticolocation-3.exp b/cts/scheduler/exp/bundle-promoted-anticolocation-3.exp -index 7febd99cb9..209f73d244 100644 ---- a/cts/scheduler/exp/bundle-promoted-anticolocation-3.exp -+++ b/cts/scheduler/exp/bundle-promoted-anticolocation-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-promoted-anticolocation-4.exp b/cts/scheduler/exp/bundle-promoted-anticolocation-4.exp -index 7febd99cb9..209f73d244 100644 ---- a/cts/scheduler/exp/bundle-promoted-anticolocation-4.exp -+++ b/cts/scheduler/exp/bundle-promoted-anticolocation-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-promoted-anticolocation-5.exp b/cts/scheduler/exp/bundle-promoted-anticolocation-5.exp -index d5861ab473..87198bf3e8 100644 ---- a/cts/scheduler/exp/bundle-promoted-anticolocation-5.exp -+++ b/cts/scheduler/exp/bundle-promoted-anticolocation-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-promoted-anticolocation-6.exp b/cts/scheduler/exp/bundle-promoted-anticolocation-6.exp -index d5861ab473..87198bf3e8 100644 ---- a/cts/scheduler/exp/bundle-promoted-anticolocation-6.exp -+++ b/cts/scheduler/exp/bundle-promoted-anticolocation-6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-promoted-colocation-1.exp b/cts/scheduler/exp/bundle-promoted-colocation-1.exp -index 8d7ea7ac6b..846fd86524 100644 ---- a/cts/scheduler/exp/bundle-promoted-colocation-1.exp -+++ b/cts/scheduler/exp/bundle-promoted-colocation-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-promoted-colocation-2.exp b/cts/scheduler/exp/bundle-promoted-colocation-2.exp -index 8d7ea7ac6b..846fd86524 100644 ---- a/cts/scheduler/exp/bundle-promoted-colocation-2.exp -+++ b/cts/scheduler/exp/bundle-promoted-colocation-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-promoted-colocation-3.exp b/cts/scheduler/exp/bundle-promoted-colocation-3.exp -index 1963bbbb21..46b32e7a23 100644 ---- a/cts/scheduler/exp/bundle-promoted-colocation-3.exp -+++ b/cts/scheduler/exp/bundle-promoted-colocation-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-promoted-colocation-4.exp b/cts/scheduler/exp/bundle-promoted-colocation-4.exp -index 1963bbbb21..46b32e7a23 100644 ---- a/cts/scheduler/exp/bundle-promoted-colocation-4.exp -+++ b/cts/scheduler/exp/bundle-promoted-colocation-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-promoted-colocation-5.exp b/cts/scheduler/exp/bundle-promoted-colocation-5.exp -index d3c6df3f00..3ab8b669e6 100644 ---- a/cts/scheduler/exp/bundle-promoted-colocation-5.exp -+++ b/cts/scheduler/exp/bundle-promoted-colocation-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-promoted-colocation-6.exp b/cts/scheduler/exp/bundle-promoted-colocation-6.exp -index d3c6df3f00..3ab8b669e6 100644 ---- a/cts/scheduler/exp/bundle-promoted-colocation-6.exp -+++ b/cts/scheduler/exp/bundle-promoted-colocation-6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-promoted-location-1.exp b/cts/scheduler/exp/bundle-promoted-location-1.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/bundle-promoted-location-1.exp -+++ b/cts/scheduler/exp/bundle-promoted-location-1.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/bundle-promoted-location-2.exp b/cts/scheduler/exp/bundle-promoted-location-2.exp -index cbb74babd7..f4539abd1c 100644 ---- a/cts/scheduler/exp/bundle-promoted-location-2.exp -+++ b/cts/scheduler/exp/bundle-promoted-location-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-promoted-location-3.exp b/cts/scheduler/exp/bundle-promoted-location-3.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/bundle-promoted-location-3.exp -+++ b/cts/scheduler/exp/bundle-promoted-location-3.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/bundle-promoted-location-4.exp b/cts/scheduler/exp/bundle-promoted-location-4.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/bundle-promoted-location-4.exp -+++ b/cts/scheduler/exp/bundle-promoted-location-4.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/bundle-promoted-location-5.exp b/cts/scheduler/exp/bundle-promoted-location-5.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/bundle-promoted-location-5.exp -+++ b/cts/scheduler/exp/bundle-promoted-location-5.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/bundle-promoted-location-6.exp b/cts/scheduler/exp/bundle-promoted-location-6.exp -index 07a6a2d35e..138c7c5acf 100644 ---- a/cts/scheduler/exp/bundle-promoted-location-6.exp -+++ b/cts/scheduler/exp/bundle-promoted-location-6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/bundle-replicas-change.exp b/cts/scheduler/exp/bundle-replicas-change.exp -index ec89d948b5..046b0c2870 100644 ---- a/cts/scheduler/exp/bundle-replicas-change.exp -+++ b/cts/scheduler/exp/bundle-replicas-change.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/cancel-behind-moving-remote.exp b/cts/scheduler/exp/cancel-behind-moving-remote.exp -index 91651ba9e2..4f63367c5d 100644 ---- a/cts/scheduler/exp/cancel-behind-moving-remote.exp -+++ b/cts/scheduler/exp/cancel-behind-moving-remote.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clbz5007-promotable-colocation.exp b/cts/scheduler/exp/clbz5007-promotable-colocation.exp -index 8ce6372476..9bc2b09262 100644 ---- a/cts/scheduler/exp/clbz5007-promotable-colocation.exp -+++ b/cts/scheduler/exp/clbz5007-promotable-colocation.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-anon-dup.exp b/cts/scheduler/exp/clone-anon-dup.exp -index 2ba7ede994..b32a996c83 100644 ---- a/cts/scheduler/exp/clone-anon-dup.exp -+++ b/cts/scheduler/exp/clone-anon-dup.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-anon-failcount.exp b/cts/scheduler/exp/clone-anon-failcount.exp -index a48f69b88d..11b2efacc7 100644 ---- a/cts/scheduler/exp/clone-anon-failcount.exp -+++ b/cts/scheduler/exp/clone-anon-failcount.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-anon-probe-1.exp b/cts/scheduler/exp/clone-anon-probe-1.exp -index 3eb15b8ff3..198efd955d 100644 ---- a/cts/scheduler/exp/clone-anon-probe-1.exp -+++ b/cts/scheduler/exp/clone-anon-probe-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-anon-probe-2.exp b/cts/scheduler/exp/clone-anon-probe-2.exp -index df84aae0c1..3ac6f9bd9e 100644 ---- a/cts/scheduler/exp/clone-anon-probe-2.exp -+++ b/cts/scheduler/exp/clone-anon-probe-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-fail-block-colocation.exp b/cts/scheduler/exp/clone-fail-block-colocation.exp -index 0f6c3470c9..bb7c0071c6 100644 ---- a/cts/scheduler/exp/clone-fail-block-colocation.exp -+++ b/cts/scheduler/exp/clone-fail-block-colocation.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-interleave-1.exp b/cts/scheduler/exp/clone-interleave-1.exp -index 255022c66e..75974a0eba 100644 ---- a/cts/scheduler/exp/clone-interleave-1.exp -+++ b/cts/scheduler/exp/clone-interleave-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-interleave-2.exp b/cts/scheduler/exp/clone-interleave-2.exp -index 4a6b512ff7..e6ab2e280a 100644 ---- a/cts/scheduler/exp/clone-interleave-2.exp -+++ b/cts/scheduler/exp/clone-interleave-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-interleave-3.exp b/cts/scheduler/exp/clone-interleave-3.exp -index 1cb7e29274..c88156a54b 100644 ---- a/cts/scheduler/exp/clone-interleave-3.exp -+++ b/cts/scheduler/exp/clone-interleave-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-max-zero.exp b/cts/scheduler/exp/clone-max-zero.exp -index 53f4109cf7..01a0f1f0bc 100644 ---- a/cts/scheduler/exp/clone-max-zero.exp -+++ b/cts/scheduler/exp/clone-max-zero.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-no-shuffle.exp b/cts/scheduler/exp/clone-no-shuffle.exp -index 88f18f9aa0..43b6ef4f57 100644 ---- a/cts/scheduler/exp/clone-no-shuffle.exp -+++ b/cts/scheduler/exp/clone-no-shuffle.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-order-16instances.exp b/cts/scheduler/exp/clone-order-16instances.exp -index b06826b4c2..4f351a5b4d 100644 ---- a/cts/scheduler/exp/clone-order-16instances.exp -+++ b/cts/scheduler/exp/clone-order-16instances.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-order-primitive.exp b/cts/scheduler/exp/clone-order-primitive.exp -index b54c970d5d..b397869d46 100644 ---- a/cts/scheduler/exp/clone-order-primitive.exp -+++ b/cts/scheduler/exp/clone-order-primitive.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-recover-no-shuffle-1.exp b/cts/scheduler/exp/clone-recover-no-shuffle-1.exp -index 670a823dac..4b5cd59995 100644 ---- a/cts/scheduler/exp/clone-recover-no-shuffle-1.exp -+++ b/cts/scheduler/exp/clone-recover-no-shuffle-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-recover-no-shuffle-10.exp b/cts/scheduler/exp/clone-recover-no-shuffle-10.exp -index 27b8b7037c..d1a5a3cb1c 100644 ---- a/cts/scheduler/exp/clone-recover-no-shuffle-10.exp -+++ b/cts/scheduler/exp/clone-recover-no-shuffle-10.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-recover-no-shuffle-11.exp b/cts/scheduler/exp/clone-recover-no-shuffle-11.exp -index 40cf1f69c1..9d44a89f0f 100644 ---- a/cts/scheduler/exp/clone-recover-no-shuffle-11.exp -+++ b/cts/scheduler/exp/clone-recover-no-shuffle-11.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-recover-no-shuffle-12.exp b/cts/scheduler/exp/clone-recover-no-shuffle-12.exp -index 919e6b291c..ee008aa9e5 100644 ---- a/cts/scheduler/exp/clone-recover-no-shuffle-12.exp -+++ b/cts/scheduler/exp/clone-recover-no-shuffle-12.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-recover-no-shuffle-2.exp b/cts/scheduler/exp/clone-recover-no-shuffle-2.exp -index 84b1e1bc98..d9f0a2485b 100644 ---- a/cts/scheduler/exp/clone-recover-no-shuffle-2.exp -+++ b/cts/scheduler/exp/clone-recover-no-shuffle-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-recover-no-shuffle-3.exp b/cts/scheduler/exp/clone-recover-no-shuffle-3.exp -index 6b6ed075f5..8482709e27 100644 ---- a/cts/scheduler/exp/clone-recover-no-shuffle-3.exp -+++ b/cts/scheduler/exp/clone-recover-no-shuffle-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-recover-no-shuffle-4.exp b/cts/scheduler/exp/clone-recover-no-shuffle-4.exp -index 670a823dac..4b5cd59995 100644 ---- a/cts/scheduler/exp/clone-recover-no-shuffle-4.exp -+++ b/cts/scheduler/exp/clone-recover-no-shuffle-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-recover-no-shuffle-5.exp b/cts/scheduler/exp/clone-recover-no-shuffle-5.exp -index 84b1e1bc98..d9f0a2485b 100644 ---- a/cts/scheduler/exp/clone-recover-no-shuffle-5.exp -+++ b/cts/scheduler/exp/clone-recover-no-shuffle-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-recover-no-shuffle-6.exp b/cts/scheduler/exp/clone-recover-no-shuffle-6.exp -index 6b6ed075f5..8482709e27 100644 ---- a/cts/scheduler/exp/clone-recover-no-shuffle-6.exp -+++ b/cts/scheduler/exp/clone-recover-no-shuffle-6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-recover-no-shuffle-7.exp b/cts/scheduler/exp/clone-recover-no-shuffle-7.exp -index 870ed54e9c..fa9059f93b 100644 ---- a/cts/scheduler/exp/clone-recover-no-shuffle-7.exp -+++ b/cts/scheduler/exp/clone-recover-no-shuffle-7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-recover-no-shuffle-8.exp b/cts/scheduler/exp/clone-recover-no-shuffle-8.exp -index 763a2f02fb..df98313e1f 100644 ---- a/cts/scheduler/exp/clone-recover-no-shuffle-8.exp -+++ b/cts/scheduler/exp/clone-recover-no-shuffle-8.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-recover-no-shuffle-9.exp b/cts/scheduler/exp/clone-recover-no-shuffle-9.exp -index e249bc737e..2b2e3d644c 100644 ---- a/cts/scheduler/exp/clone-recover-no-shuffle-9.exp -+++ b/cts/scheduler/exp/clone-recover-no-shuffle-9.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-require-all-1.exp b/cts/scheduler/exp/clone-require-all-1.exp -index d77d1f366b..d61e796a5c 100644 ---- a/cts/scheduler/exp/clone-require-all-1.exp -+++ b/cts/scheduler/exp/clone-require-all-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-require-all-2.exp b/cts/scheduler/exp/clone-require-all-2.exp -index 6caf5f9bb2..025c53e295 100644 ---- a/cts/scheduler/exp/clone-require-all-2.exp -+++ b/cts/scheduler/exp/clone-require-all-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-require-all-3.exp b/cts/scheduler/exp/clone-require-all-3.exp -index 8b223c88ba..ea186f02e7 100644 ---- a/cts/scheduler/exp/clone-require-all-3.exp -+++ b/cts/scheduler/exp/clone-require-all-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-require-all-4.exp b/cts/scheduler/exp/clone-require-all-4.exp -index 2e36de620b..d3d6dca955 100644 ---- a/cts/scheduler/exp/clone-require-all-4.exp -+++ b/cts/scheduler/exp/clone-require-all-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-require-all-5.exp b/cts/scheduler/exp/clone-require-all-5.exp -index 34dab7b51c..9c99ab62a3 100644 ---- a/cts/scheduler/exp/clone-require-all-5.exp -+++ b/cts/scheduler/exp/clone-require-all-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-require-all-6.exp b/cts/scheduler/exp/clone-require-all-6.exp -index 3efc8ed488..183797779d 100644 ---- a/cts/scheduler/exp/clone-require-all-6.exp -+++ b/cts/scheduler/exp/clone-require-all-6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-require-all-7.exp b/cts/scheduler/exp/clone-require-all-7.exp -index 6c401b36d9..458fa0873d 100644 ---- a/cts/scheduler/exp/clone-require-all-7.exp -+++ b/cts/scheduler/exp/clone-require-all-7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-require-all-no-interleave-1.exp b/cts/scheduler/exp/clone-require-all-no-interleave-1.exp -index ae9845972c..ae31b5e5dc 100644 ---- a/cts/scheduler/exp/clone-require-all-no-interleave-1.exp -+++ b/cts/scheduler/exp/clone-require-all-no-interleave-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-require-all-no-interleave-2.exp b/cts/scheduler/exp/clone-require-all-no-interleave-2.exp -index d63b0d9d69..0cdd53d2ae 100644 ---- a/cts/scheduler/exp/clone-require-all-no-interleave-2.exp -+++ b/cts/scheduler/exp/clone-require-all-no-interleave-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-require-all-no-interleave-3.exp b/cts/scheduler/exp/clone-require-all-no-interleave-3.exp -index c50b8c8a06..4b7f749eae 100644 ---- a/cts/scheduler/exp/clone-require-all-no-interleave-3.exp -+++ b/cts/scheduler/exp/clone-require-all-no-interleave-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-requires-quorum-recovery.exp b/cts/scheduler/exp/clone-requires-quorum-recovery.exp -index 13a9e717f7..ddf22dccc4 100644 ---- a/cts/scheduler/exp/clone-requires-quorum-recovery.exp -+++ b/cts/scheduler/exp/clone-requires-quorum-recovery.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone-requires-quorum.exp b/cts/scheduler/exp/clone-requires-quorum.exp -index 5c6dce0529..9f532fd23f 100644 ---- a/cts/scheduler/exp/clone-requires-quorum.exp -+++ b/cts/scheduler/exp/clone-requires-quorum.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone_min_interleave_start_one.exp b/cts/scheduler/exp/clone_min_interleave_start_one.exp -index c915054247..2f2fd620f2 100644 ---- a/cts/scheduler/exp/clone_min_interleave_start_one.exp -+++ b/cts/scheduler/exp/clone_min_interleave_start_one.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone_min_interleave_start_two.exp b/cts/scheduler/exp/clone_min_interleave_start_two.exp -index a82af703ed..ded2b28406 100644 ---- a/cts/scheduler/exp/clone_min_interleave_start_two.exp -+++ b/cts/scheduler/exp/clone_min_interleave_start_two.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone_min_interleave_stop_one.exp b/cts/scheduler/exp/clone_min_interleave_stop_one.exp -index 6b0ebc51b7..806ca43e55 100644 ---- a/cts/scheduler/exp/clone_min_interleave_stop_one.exp -+++ b/cts/scheduler/exp/clone_min_interleave_stop_one.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone_min_interleave_stop_two.exp b/cts/scheduler/exp/clone_min_interleave_stop_two.exp -index 2a84007a78..7cb61b7987 100644 ---- a/cts/scheduler/exp/clone_min_interleave_stop_two.exp -+++ b/cts/scheduler/exp/clone_min_interleave_stop_two.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone_min_start_one.exp b/cts/scheduler/exp/clone_min_start_one.exp -index 9ea1efe7d1..c2aed56667 100644 ---- a/cts/scheduler/exp/clone_min_start_one.exp -+++ b/cts/scheduler/exp/clone_min_start_one.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone_min_start_two.exp b/cts/scheduler/exp/clone_min_start_two.exp -index 48e1bfd008..8c39a792b5 100644 ---- a/cts/scheduler/exp/clone_min_start_two.exp -+++ b/cts/scheduler/exp/clone_min_start_two.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone_min_stop_all.exp b/cts/scheduler/exp/clone_min_stop_all.exp -index ff42f1469a..6e97f6bfb1 100644 ---- a/cts/scheduler/exp/clone_min_stop_all.exp -+++ b/cts/scheduler/exp/clone_min_stop_all.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone_min_stop_one.exp b/cts/scheduler/exp/clone_min_stop_one.exp -index a1a0247d1f..a1569ba43f 100644 ---- a/cts/scheduler/exp/clone_min_stop_one.exp -+++ b/cts/scheduler/exp/clone_min_stop_one.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/clone_min_stop_two.exp b/cts/scheduler/exp/clone_min_stop_two.exp -index 27bb08c1c0..6638fe1acc 100644 ---- a/cts/scheduler/exp/clone_min_stop_two.exp -+++ b/cts/scheduler/exp/clone_min_stop_two.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/cloned-group-stop.exp b/cts/scheduler/exp/cloned-group-stop.exp -index 436fc2eda0..05dd655ee2 100644 ---- a/cts/scheduler/exp/cloned-group-stop.exp -+++ b/cts/scheduler/exp/cloned-group-stop.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/cloned-group.exp b/cts/scheduler/exp/cloned-group.exp -index 414906e72c..5d0bbea23b 100644 ---- a/cts/scheduler/exp/cloned-group.exp -+++ b/cts/scheduler/exp/cloned-group.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/cloned_start_one.exp b/cts/scheduler/exp/cloned_start_one.exp -index 6384787219..bc2eacddfd 100644 ---- a/cts/scheduler/exp/cloned_start_one.exp -+++ b/cts/scheduler/exp/cloned_start_one.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/cloned_start_two.exp b/cts/scheduler/exp/cloned_start_two.exp -index 80ccf2e7c7..369fa8468d 100644 ---- a/cts/scheduler/exp/cloned_start_two.exp -+++ b/cts/scheduler/exp/cloned_start_two.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/cloned_stop_one.exp b/cts/scheduler/exp/cloned_stop_one.exp -index e1cb0d06d5..f87b3f4ace 100644 ---- a/cts/scheduler/exp/cloned_stop_one.exp -+++ b/cts/scheduler/exp/cloned_stop_one.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/cloned_stop_two.exp b/cts/scheduler/exp/cloned_stop_two.exp -index 08e8dc9616..df49ab2be9 100644 ---- a/cts/scheduler/exp/cloned_stop_two.exp -+++ b/cts/scheduler/exp/cloned_stop_two.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/cluster-specific-params.exp b/cts/scheduler/exp/cluster-specific-params.exp -index 77a02e823e..f80db65ae1 100644 ---- a/cts/scheduler/exp/cluster-specific-params.exp -+++ b/cts/scheduler/exp/cluster-specific-params.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/colo_promoted_w_native.exp b/cts/scheduler/exp/colo_promoted_w_native.exp -index dc5e99adb3..615c6ef97f 100644 ---- a/cts/scheduler/exp/colo_promoted_w_native.exp -+++ b/cts/scheduler/exp/colo_promoted_w_native.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/colo_unpromoted_w_native.exp b/cts/scheduler/exp/colo_unpromoted_w_native.exp -index 0a01b35776..e14c1ab328 100644 ---- a/cts/scheduler/exp/colo_unpromoted_w_native.exp -+++ b/cts/scheduler/exp/colo_unpromoted_w_native.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/coloc-attr.exp b/cts/scheduler/exp/coloc-attr.exp -index f761ad57b6..0d22952ae9 100644 ---- a/cts/scheduler/exp/coloc-attr.exp -+++ b/cts/scheduler/exp/coloc-attr.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/coloc-clone-stays-active.exp b/cts/scheduler/exp/coloc-clone-stays-active.exp -index b86d3a1276..957416cbc5 100644 ---- a/cts/scheduler/exp/coloc-clone-stays-active.exp -+++ b/cts/scheduler/exp/coloc-clone-stays-active.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/coloc-cloned-group-promoted-dependent1.exp b/cts/scheduler/exp/coloc-cloned-group-promoted-dependent1.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/coloc-cloned-group-promoted-dependent1.exp -+++ b/cts/scheduler/exp/coloc-cloned-group-promoted-dependent1.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/coloc-cloned-group-promoted-dependent2.exp b/cts/scheduler/exp/coloc-cloned-group-promoted-dependent2.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/coloc-cloned-group-promoted-dependent2.exp -+++ b/cts/scheduler/exp/coloc-cloned-group-promoted-dependent2.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/coloc-dependee-should-move.exp b/cts/scheduler/exp/coloc-dependee-should-move.exp -index b826d3b546..972a9ddb4f 100644 ---- a/cts/scheduler/exp/coloc-dependee-should-move.exp -+++ b/cts/scheduler/exp/coloc-dependee-should-move.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/coloc-dependee-should-stay.exp b/cts/scheduler/exp/coloc-dependee-should-stay.exp -index 915363575f..122415b7ce 100644 ---- a/cts/scheduler/exp/coloc-dependee-should-stay.exp -+++ b/cts/scheduler/exp/coloc-dependee-should-stay.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/coloc-group.exp b/cts/scheduler/exp/coloc-group.exp -index 79ecac42e2..ae8fcf2942 100644 ---- a/cts/scheduler/exp/coloc-group.exp -+++ b/cts/scheduler/exp/coloc-group.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/coloc-intra-set.exp b/cts/scheduler/exp/coloc-intra-set.exp -index fbd26bf827..15b35bd851 100644 ---- a/cts/scheduler/exp/coloc-intra-set.exp -+++ b/cts/scheduler/exp/coloc-intra-set.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/coloc-list.exp b/cts/scheduler/exp/coloc-list.exp -index d7dec3e60c..3f0f7a8d28 100644 ---- a/cts/scheduler/exp/coloc-list.exp -+++ b/cts/scheduler/exp/coloc-list.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/coloc-loop.exp b/cts/scheduler/exp/coloc-loop.exp -index 8cecc00a1e..2dab5d4c43 100644 ---- a/cts/scheduler/exp/coloc-loop.exp -+++ b/cts/scheduler/exp/coloc-loop.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/coloc-many-one.exp b/cts/scheduler/exp/coloc-many-one.exp -index e1397aa01d..4b815e13b0 100644 ---- a/cts/scheduler/exp/coloc-many-one.exp -+++ b/cts/scheduler/exp/coloc-many-one.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/coloc-negative-group.exp b/cts/scheduler/exp/coloc-negative-group.exp -index d8e908e640..4dec856747 100644 ---- a/cts/scheduler/exp/coloc-negative-group.exp -+++ b/cts/scheduler/exp/coloc-negative-group.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/coloc-optional-promoted-dependent-moves-1.exp b/cts/scheduler/exp/coloc-optional-promoted-dependent-moves-1.exp -index eb03489eb3..9825e7d6ef 100644 ---- a/cts/scheduler/exp/coloc-optional-promoted-dependent-moves-1.exp -+++ b/cts/scheduler/exp/coloc-optional-promoted-dependent-moves-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/coloc-optional-promoted-dependent-moves-2.exp b/cts/scheduler/exp/coloc-optional-promoted-dependent-moves-2.exp -index e02a466611..cad19276ce 100644 ---- a/cts/scheduler/exp/coloc-optional-promoted-dependent-moves-2.exp -+++ b/cts/scheduler/exp/coloc-optional-promoted-dependent-moves-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/coloc-optional-promoted-dependent-stays-1.exp b/cts/scheduler/exp/coloc-optional-promoted-dependent-stays-1.exp -index 48451cfb4a..eef5035055 100644 ---- a/cts/scheduler/exp/coloc-optional-promoted-dependent-stays-1.exp -+++ b/cts/scheduler/exp/coloc-optional-promoted-dependent-stays-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/coloc-optional-promoted-dependent-stays-2.exp b/cts/scheduler/exp/coloc-optional-promoted-dependent-stays-2.exp -index 48451cfb4a..eef5035055 100644 ---- a/cts/scheduler/exp/coloc-optional-promoted-dependent-stays-2.exp -+++ b/cts/scheduler/exp/coloc-optional-promoted-dependent-stays-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/coloc-unpromoted-anti.exp b/cts/scheduler/exp/coloc-unpromoted-anti.exp -index 0f76cfb9fa..79a9017b9f 100644 ---- a/cts/scheduler/exp/coloc-unpromoted-anti.exp -+++ b/cts/scheduler/exp/coloc-unpromoted-anti.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/coloc-with-inner-group-member.exp b/cts/scheduler/exp/coloc-with-inner-group-member.exp -index bb8f779feb..2f1db5d935 100644 ---- a/cts/scheduler/exp/coloc-with-inner-group-member.exp -+++ b/cts/scheduler/exp/coloc-with-inner-group-member.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/coloc_fp_logic.exp b/cts/scheduler/exp/coloc_fp_logic.exp -index 6527fa212d..efaf4c23e1 100644 ---- a/cts/scheduler/exp/coloc_fp_logic.exp -+++ b/cts/scheduler/exp/coloc_fp_logic.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/colocate-primitive-with-clone.exp b/cts/scheduler/exp/colocate-primitive-with-clone.exp -index 638fc48c26..81b05b68bc 100644 ---- a/cts/scheduler/exp/colocate-primitive-with-clone.exp -+++ b/cts/scheduler/exp/colocate-primitive-with-clone.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/colocate-unmanaged-group.exp b/cts/scheduler/exp/colocate-unmanaged-group.exp -index e2c16ab50f..a1418d9ba6 100644 ---- a/cts/scheduler/exp/colocate-unmanaged-group.exp -+++ b/cts/scheduler/exp/colocate-unmanaged-group.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/colocated-utilization-clone.exp b/cts/scheduler/exp/colocated-utilization-clone.exp -index 68cd6d4c52..f83092d25f 100644 ---- a/cts/scheduler/exp/colocated-utilization-clone.exp -+++ b/cts/scheduler/exp/colocated-utilization-clone.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/colocated-utilization-group.exp b/cts/scheduler/exp/colocated-utilization-group.exp -index ebfa46f3d7..93e7857c76 100644 ---- a/cts/scheduler/exp/colocated-utilization-group.exp -+++ b/cts/scheduler/exp/colocated-utilization-group.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/colocated-utilization-primitive-1.exp b/cts/scheduler/exp/colocated-utilization-primitive-1.exp -index 570ef6c9d4..45e301a1d5 100644 ---- a/cts/scheduler/exp/colocated-utilization-primitive-1.exp -+++ b/cts/scheduler/exp/colocated-utilization-primitive-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/colocated-utilization-primitive-2.exp b/cts/scheduler/exp/colocated-utilization-primitive-2.exp -index 9d5e5132cc..d51c7de47f 100644 ---- a/cts/scheduler/exp/colocated-utilization-primitive-2.exp -+++ b/cts/scheduler/exp/colocated-utilization-primitive-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/colocation-influence.exp b/cts/scheduler/exp/colocation-influence.exp -index 410c46f460..4f1fe040cf 100644 ---- a/cts/scheduler/exp/colocation-influence.exp -+++ b/cts/scheduler/exp/colocation-influence.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/colocation-priority-group.exp b/cts/scheduler/exp/colocation-priority-group.exp -index ae79d83613..3b2e6615f3 100644 ---- a/cts/scheduler/exp/colocation-priority-group.exp -+++ b/cts/scheduler/exp/colocation-priority-group.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/colocation-vs-stickiness.exp b/cts/scheduler/exp/colocation-vs-stickiness.exp -index 915363575f..122415b7ce 100644 ---- a/cts/scheduler/exp/colocation-vs-stickiness.exp -+++ b/cts/scheduler/exp/colocation-vs-stickiness.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/colocation_constraint_stops_promoted.exp b/cts/scheduler/exp/colocation_constraint_stops_promoted.exp -index 1c395d71c6..9d6cec097a 100644 ---- a/cts/scheduler/exp/colocation_constraint_stops_promoted.exp -+++ b/cts/scheduler/exp/colocation_constraint_stops_promoted.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/colocation_constraint_stops_unpromoted.exp b/cts/scheduler/exp/colocation_constraint_stops_unpromoted.exp -index 212b8691ee..c94a846f07 100644 ---- a/cts/scheduler/exp/colocation_constraint_stops_unpromoted.exp -+++ b/cts/scheduler/exp/colocation_constraint_stops_unpromoted.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/comments.exp b/cts/scheduler/exp/comments.exp -index 60bf98ebe5..1bcc5c3e2d 100644 ---- a/cts/scheduler/exp/comments.exp -+++ b/cts/scheduler/exp/comments.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/complex_enforce_colo.exp b/cts/scheduler/exp/complex_enforce_colo.exp -index db9e2469ca..449bd372fb 100644 ---- a/cts/scheduler/exp/complex_enforce_colo.exp -+++ b/cts/scheduler/exp/complex_enforce_colo.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/concurrent-fencing.exp b/cts/scheduler/exp/concurrent-fencing.exp -index 23295e3fe5..5ec9694399 100644 ---- a/cts/scheduler/exp/concurrent-fencing.exp -+++ b/cts/scheduler/exp/concurrent-fencing.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/container-1.exp b/cts/scheduler/exp/container-1.exp -index 24828c7ab9..d51d26908a 100644 ---- a/cts/scheduler/exp/container-1.exp -+++ b/cts/scheduler/exp/container-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/container-2.exp b/cts/scheduler/exp/container-2.exp -index 70b5485847..07230ca12c 100644 ---- a/cts/scheduler/exp/container-2.exp -+++ b/cts/scheduler/exp/container-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/container-3.exp b/cts/scheduler/exp/container-3.exp -index 5237858a08..5bdde4eb0f 100644 ---- a/cts/scheduler/exp/container-3.exp -+++ b/cts/scheduler/exp/container-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/container-4.exp b/cts/scheduler/exp/container-4.exp -index 77ebec46d8..d053374e92 100644 ---- a/cts/scheduler/exp/container-4.exp -+++ b/cts/scheduler/exp/container-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/container-group-1.exp b/cts/scheduler/exp/container-group-1.exp -index a430c98bb7..97990ad8da 100644 ---- a/cts/scheduler/exp/container-group-1.exp -+++ b/cts/scheduler/exp/container-group-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/container-group-2.exp b/cts/scheduler/exp/container-group-2.exp -index e766c5f45c..06d34ae6dd 100644 ---- a/cts/scheduler/exp/container-group-2.exp -+++ b/cts/scheduler/exp/container-group-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/container-group-3.exp b/cts/scheduler/exp/container-group-3.exp -index ceb5971727..b9e1f2f331 100644 ---- a/cts/scheduler/exp/container-group-3.exp -+++ b/cts/scheduler/exp/container-group-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/container-group-4.exp b/cts/scheduler/exp/container-group-4.exp -index 3d5df62c04..88531328d5 100644 ---- a/cts/scheduler/exp/container-group-4.exp -+++ b/cts/scheduler/exp/container-group-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/container-is-remote-node.exp b/cts/scheduler/exp/container-is-remote-node.exp -index 35c21818d8..ab6c91b400 100644 ---- a/cts/scheduler/exp/container-is-remote-node.exp -+++ b/cts/scheduler/exp/container-is-remote-node.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/date-1.exp b/cts/scheduler/exp/date-1.exp -index 32d0d80bbe..4bc5283e41 100644 ---- a/cts/scheduler/exp/date-1.exp -+++ b/cts/scheduler/exp/date-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/date-2.exp b/cts/scheduler/exp/date-2.exp -index f51289df82..b2add29019 100644 ---- a/cts/scheduler/exp/date-2.exp -+++ b/cts/scheduler/exp/date-2.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/date-3.exp b/cts/scheduler/exp/date-3.exp -index 4487d632eb..3e16cf9945 100644 ---- a/cts/scheduler/exp/date-3.exp -+++ b/cts/scheduler/exp/date-3.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/dc-fence-ordering.exp b/cts/scheduler/exp/dc-fence-ordering.exp -index 429db5a6d7..207cef59ba 100644 ---- a/cts/scheduler/exp/dc-fence-ordering.exp -+++ b/cts/scheduler/exp/dc-fence-ordering.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/enforce-colo1.exp b/cts/scheduler/exp/enforce-colo1.exp -index 8e1530850c..81bfa6a450 100644 ---- a/cts/scheduler/exp/enforce-colo1.exp -+++ b/cts/scheduler/exp/enforce-colo1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/expire-non-blocked-failure.exp b/cts/scheduler/exp/expire-non-blocked-failure.exp -index 32bedc8dad..ad708fedbb 100644 ---- a/cts/scheduler/exp/expire-non-blocked-failure.exp -+++ b/cts/scheduler/exp/expire-non-blocked-failure.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/expired-failed-probe-primitive.exp b/cts/scheduler/exp/expired-failed-probe-primitive.exp -index 3c2cbfe411..3aed9a787e 100644 ---- a/cts/scheduler/exp/expired-failed-probe-primitive.exp -+++ b/cts/scheduler/exp/expired-failed-probe-primitive.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/expired-stop-1.exp b/cts/scheduler/exp/expired-stop-1.exp -index 61a6afbbdb..56c721ce62 100644 ---- a/cts/scheduler/exp/expired-stop-1.exp -+++ b/cts/scheduler/exp/expired-stop-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/failcount-block.exp b/cts/scheduler/exp/failcount-block.exp -index 85beb5c315..391bcbe12d 100644 ---- a/cts/scheduler/exp/failcount-block.exp -+++ b/cts/scheduler/exp/failcount-block.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/failcount.exp b/cts/scheduler/exp/failcount.exp -index bf6aff3ef3..1598c1e136 100644 ---- a/cts/scheduler/exp/failcount.exp -+++ b/cts/scheduler/exp/failcount.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/failed-demote-recovery-promoted.exp b/cts/scheduler/exp/failed-demote-recovery-promoted.exp -index bffa22011c..469c835aff 100644 ---- a/cts/scheduler/exp/failed-demote-recovery-promoted.exp -+++ b/cts/scheduler/exp/failed-demote-recovery-promoted.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/failed-demote-recovery.exp b/cts/scheduler/exp/failed-demote-recovery.exp -index fd08667544..3741a741ef 100644 ---- a/cts/scheduler/exp/failed-demote-recovery.exp -+++ b/cts/scheduler/exp/failed-demote-recovery.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/failed-probe-clone.exp b/cts/scheduler/exp/failed-probe-clone.exp -index 6be18935bf..5fe1f04a70 100644 ---- a/cts/scheduler/exp/failed-probe-clone.exp -+++ b/cts/scheduler/exp/failed-probe-clone.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/failed-probe-primitive.exp b/cts/scheduler/exp/failed-probe-primitive.exp -index d0d8aa44dc..899aa67984 100644 ---- a/cts/scheduler/exp/failed-probe-primitive.exp -+++ b/cts/scheduler/exp/failed-probe-primitive.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/failed-sticky-anticolocated-group.exp b/cts/scheduler/exp/failed-sticky-anticolocated-group.exp -index 4e57e1831a..9633aaa993 100644 ---- a/cts/scheduler/exp/failed-sticky-anticolocated-group.exp -+++ b/cts/scheduler/exp/failed-sticky-anticolocated-group.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/failed-sticky-group.exp b/cts/scheduler/exp/failed-sticky-group.exp -index ad3e17cab6..f9dc92dc59 100644 ---- a/cts/scheduler/exp/failed-sticky-group.exp -+++ b/cts/scheduler/exp/failed-sticky-group.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/force-anon-clone-max.exp b/cts/scheduler/exp/force-anon-clone-max.exp -index 3d016143cc..32621d6c8e 100644 ---- a/cts/scheduler/exp/force-anon-clone-max.exp -+++ b/cts/scheduler/exp/force-anon-clone-max.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group-anticolocation-2.exp b/cts/scheduler/exp/group-anticolocation-2.exp -index 4e57e1831a..9633aaa993 100644 ---- a/cts/scheduler/exp/group-anticolocation-2.exp -+++ b/cts/scheduler/exp/group-anticolocation-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group-anticolocation-3.exp b/cts/scheduler/exp/group-anticolocation-3.exp -index 066b3bd5f4..3a7e42214c 100644 ---- a/cts/scheduler/exp/group-anticolocation-3.exp -+++ b/cts/scheduler/exp/group-anticolocation-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group-anticolocation-4.exp b/cts/scheduler/exp/group-anticolocation-4.exp -index 4e57e1831a..9633aaa993 100644 ---- a/cts/scheduler/exp/group-anticolocation-4.exp -+++ b/cts/scheduler/exp/group-anticolocation-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group-anticolocation-5.exp b/cts/scheduler/exp/group-anticolocation-5.exp -index 2394b4e477..f8fa9383c3 100644 ---- a/cts/scheduler/exp/group-anticolocation-5.exp -+++ b/cts/scheduler/exp/group-anticolocation-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group-anticolocation.exp b/cts/scheduler/exp/group-anticolocation.exp -index 5a37559329..a8a4c1d7d6 100644 ---- a/cts/scheduler/exp/group-anticolocation.exp -+++ b/cts/scheduler/exp/group-anticolocation.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group-colocation-failure.exp b/cts/scheduler/exp/group-colocation-failure.exp -index c57ba8bf6b..75ff7cf5f4 100644 ---- a/cts/scheduler/exp/group-colocation-failure.exp -+++ b/cts/scheduler/exp/group-colocation-failure.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group-dependents.exp b/cts/scheduler/exp/group-dependents.exp -index 98b81b4918..62d2675762 100644 ---- a/cts/scheduler/exp/group-dependents.exp -+++ b/cts/scheduler/exp/group-dependents.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group-fail.exp b/cts/scheduler/exp/group-fail.exp -index 80bf087155..5a60b81c64 100644 ---- a/cts/scheduler/exp/group-fail.exp -+++ b/cts/scheduler/exp/group-fail.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group-stop-ordering.exp b/cts/scheduler/exp/group-stop-ordering.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/group-stop-ordering.exp -+++ b/cts/scheduler/exp/group-stop-ordering.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/group-unmanaged-stopped.exp b/cts/scheduler/exp/group-unmanaged-stopped.exp -index cc874ea217..5b295d62fa 100644 ---- a/cts/scheduler/exp/group-unmanaged-stopped.exp -+++ b/cts/scheduler/exp/group-unmanaged-stopped.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group-unmanaged.exp b/cts/scheduler/exp/group-unmanaged.exp -index 915363575f..122415b7ce 100644 ---- a/cts/scheduler/exp/group-unmanaged.exp -+++ b/cts/scheduler/exp/group-unmanaged.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/group1.exp b/cts/scheduler/exp/group1.exp -index d07251984e..be5c80bf10 100644 ---- a/cts/scheduler/exp/group1.exp -+++ b/cts/scheduler/exp/group1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group10.exp b/cts/scheduler/exp/group10.exp -index 0f825d2363..e77c8e872c 100644 ---- a/cts/scheduler/exp/group10.exp -+++ b/cts/scheduler/exp/group10.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group11.exp b/cts/scheduler/exp/group11.exp -index 38b5fab300..54ae27e86c 100644 ---- a/cts/scheduler/exp/group11.exp -+++ b/cts/scheduler/exp/group11.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group13.exp b/cts/scheduler/exp/group13.exp -index e947c5e92d..f0a0449f52 100644 ---- a/cts/scheduler/exp/group13.exp -+++ b/cts/scheduler/exp/group13.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group14.exp b/cts/scheduler/exp/group14.exp -index b0f1217cb5..bd26227afb 100644 ---- a/cts/scheduler/exp/group14.exp -+++ b/cts/scheduler/exp/group14.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group15.exp b/cts/scheduler/exp/group15.exp -index d2e3e46250..596fb81c0c 100644 ---- a/cts/scheduler/exp/group15.exp -+++ b/cts/scheduler/exp/group15.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group2.exp b/cts/scheduler/exp/group2.exp -index c50bd2bf57..def7a94955 100644 ---- a/cts/scheduler/exp/group2.exp -+++ b/cts/scheduler/exp/group2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group3.exp b/cts/scheduler/exp/group3.exp -index 332027d7a2..61b0c59d83 100644 ---- a/cts/scheduler/exp/group3.exp -+++ b/cts/scheduler/exp/group3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group4.exp b/cts/scheduler/exp/group4.exp -index 6b945b041e..71b470270a 100644 ---- a/cts/scheduler/exp/group4.exp -+++ b/cts/scheduler/exp/group4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group5.exp b/cts/scheduler/exp/group5.exp -index cbf70e6852..4705f65bbe 100644 ---- a/cts/scheduler/exp/group5.exp -+++ b/cts/scheduler/exp/group5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group6.exp b/cts/scheduler/exp/group6.exp -index f96807b6ff..43a7f79547 100644 ---- a/cts/scheduler/exp/group6.exp -+++ b/cts/scheduler/exp/group6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group7.exp b/cts/scheduler/exp/group7.exp -index f5c6c4ecab..52217c4b0d 100644 ---- a/cts/scheduler/exp/group7.exp -+++ b/cts/scheduler/exp/group7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group8.exp b/cts/scheduler/exp/group8.exp -index 203b3055e8..8bf437f761 100644 ---- a/cts/scheduler/exp/group8.exp -+++ b/cts/scheduler/exp/group8.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/group9.exp b/cts/scheduler/exp/group9.exp -index 69a20b2455..f918a0e2af 100644 ---- a/cts/scheduler/exp/group9.exp -+++ b/cts/scheduler/exp/group9.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/guest-host-not-fenceable.exp b/cts/scheduler/exp/guest-host-not-fenceable.exp -index 7cf64462e0..fbbea59e6a 100644 ---- a/cts/scheduler/exp/guest-host-not-fenceable.exp -+++ b/cts/scheduler/exp/guest-host-not-fenceable.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/guest-node-cleanup.exp b/cts/scheduler/exp/guest-node-cleanup.exp -index 2253a97547..688de2c315 100644 ---- a/cts/scheduler/exp/guest-node-cleanup.exp -+++ b/cts/scheduler/exp/guest-node-cleanup.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/guest-node-host-dies.exp b/cts/scheduler/exp/guest-node-host-dies.exp -index cc601e2ae2..bd5c127e60 100644 ---- a/cts/scheduler/exp/guest-node-host-dies.exp -+++ b/cts/scheduler/exp/guest-node-host-dies.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/history-1.exp b/cts/scheduler/exp/history-1.exp -index 915363575f..122415b7ce 100644 ---- a/cts/scheduler/exp/history-1.exp -+++ b/cts/scheduler/exp/history-1.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/honor_stonith_rsc_order1.exp b/cts/scheduler/exp/honor_stonith_rsc_order1.exp -index 84774cdd3b..92cca65455 100644 ---- a/cts/scheduler/exp/honor_stonith_rsc_order1.exp -+++ b/cts/scheduler/exp/honor_stonith_rsc_order1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/honor_stonith_rsc_order2.exp b/cts/scheduler/exp/honor_stonith_rsc_order2.exp -index 5bbd3aaac6..d27d3de8b5 100644 ---- a/cts/scheduler/exp/honor_stonith_rsc_order2.exp -+++ b/cts/scheduler/exp/honor_stonith_rsc_order2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/honor_stonith_rsc_order3.exp b/cts/scheduler/exp/honor_stonith_rsc_order3.exp -index 5990381b5b..92fb886687 100644 ---- a/cts/scheduler/exp/honor_stonith_rsc_order3.exp -+++ b/cts/scheduler/exp/honor_stonith_rsc_order3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/honor_stonith_rsc_order4.exp b/cts/scheduler/exp/honor_stonith_rsc_order4.exp -index 35ddb3e529..9e4e1aa72c 100644 ---- a/cts/scheduler/exp/honor_stonith_rsc_order4.exp -+++ b/cts/scheduler/exp/honor_stonith_rsc_order4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ignore_stonith_rsc_order1.exp b/cts/scheduler/exp/ignore_stonith_rsc_order1.exp -index 9063bc6f62..bb9229b4c9 100644 ---- a/cts/scheduler/exp/ignore_stonith_rsc_order1.exp -+++ b/cts/scheduler/exp/ignore_stonith_rsc_order1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ignore_stonith_rsc_order2.exp b/cts/scheduler/exp/ignore_stonith_rsc_order2.exp -index d942d53682..71e649f459 100644 ---- a/cts/scheduler/exp/ignore_stonith_rsc_order2.exp -+++ b/cts/scheduler/exp/ignore_stonith_rsc_order2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ignore_stonith_rsc_order3.exp b/cts/scheduler/exp/ignore_stonith_rsc_order3.exp -index 111e6568dc..32ff21a424 100644 ---- a/cts/scheduler/exp/ignore_stonith_rsc_order3.exp -+++ b/cts/scheduler/exp/ignore_stonith_rsc_order3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ignore_stonith_rsc_order4.exp b/cts/scheduler/exp/ignore_stonith_rsc_order4.exp -index dd04fa791c..475d9d3203 100644 ---- a/cts/scheduler/exp/ignore_stonith_rsc_order4.exp -+++ b/cts/scheduler/exp/ignore_stonith_rsc_order4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/inc0.exp b/cts/scheduler/exp/inc0.exp -index a24ef181ca..436aec0d01 100644 ---- a/cts/scheduler/exp/inc0.exp -+++ b/cts/scheduler/exp/inc0.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/inc1.exp b/cts/scheduler/exp/inc1.exp -index 9c83d45587..072a19f4a2 100644 ---- a/cts/scheduler/exp/inc1.exp -+++ b/cts/scheduler/exp/inc1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/inc10.exp b/cts/scheduler/exp/inc10.exp -index e63bb55846..00351a0807 100644 ---- a/cts/scheduler/exp/inc10.exp -+++ b/cts/scheduler/exp/inc10.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/inc11.exp b/cts/scheduler/exp/inc11.exp -index 22425ac3ae..c5237d8dac 100644 ---- a/cts/scheduler/exp/inc11.exp -+++ b/cts/scheduler/exp/inc11.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/inc12.exp b/cts/scheduler/exp/inc12.exp -index 47721e444c..fc20224e97 100644 ---- a/cts/scheduler/exp/inc12.exp -+++ b/cts/scheduler/exp/inc12.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/inc2.exp b/cts/scheduler/exp/inc2.exp -index 5c1943ae41..9cba58e2b0 100644 ---- a/cts/scheduler/exp/inc2.exp -+++ b/cts/scheduler/exp/inc2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/inc3.exp b/cts/scheduler/exp/inc3.exp -index 2181d442f7..f9d42c043d 100644 ---- a/cts/scheduler/exp/inc3.exp -+++ b/cts/scheduler/exp/inc3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/inc4.exp b/cts/scheduler/exp/inc4.exp -index 7b1d12127f..b4509cdcaa 100644 ---- a/cts/scheduler/exp/inc4.exp -+++ b/cts/scheduler/exp/inc4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/inc5.exp b/cts/scheduler/exp/inc5.exp -index fca0f56104..c6d2bf67d9 100644 ---- a/cts/scheduler/exp/inc5.exp -+++ b/cts/scheduler/exp/inc5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/inc6.exp b/cts/scheduler/exp/inc6.exp -index 8c99205ee0..e7dbe1f995 100644 ---- a/cts/scheduler/exp/inc6.exp -+++ b/cts/scheduler/exp/inc6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/inc7.exp b/cts/scheduler/exp/inc7.exp -index 2e34697471..164ac65a54 100644 ---- a/cts/scheduler/exp/inc7.exp -+++ b/cts/scheduler/exp/inc7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/inc8.exp b/cts/scheduler/exp/inc8.exp -index 2617aaa258..4b22ede931 100644 ---- a/cts/scheduler/exp/inc8.exp -+++ b/cts/scheduler/exp/inc8.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/inc9.exp b/cts/scheduler/exp/inc9.exp -index 4023adf123..4b47caa4b5 100644 ---- a/cts/scheduler/exp/inc9.exp -+++ b/cts/scheduler/exp/inc9.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/interleave-0.exp b/cts/scheduler/exp/interleave-0.exp -index 444d8ea3d2..2251602742 100644 ---- a/cts/scheduler/exp/interleave-0.exp -+++ b/cts/scheduler/exp/interleave-0.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/interleave-1.exp b/cts/scheduler/exp/interleave-1.exp -index 444d8ea3d2..2251602742 100644 ---- a/cts/scheduler/exp/interleave-1.exp -+++ b/cts/scheduler/exp/interleave-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/interleave-2.exp b/cts/scheduler/exp/interleave-2.exp -index 444d8ea3d2..2251602742 100644 ---- a/cts/scheduler/exp/interleave-2.exp -+++ b/cts/scheduler/exp/interleave-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/interleave-3.exp b/cts/scheduler/exp/interleave-3.exp -index 444d8ea3d2..2251602742 100644 ---- a/cts/scheduler/exp/interleave-3.exp -+++ b/cts/scheduler/exp/interleave-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/interleave-pseudo-stop.exp b/cts/scheduler/exp/interleave-pseudo-stop.exp -index 9463e55155..bf985cf24f 100644 ---- a/cts/scheduler/exp/interleave-pseudo-stop.exp -+++ b/cts/scheduler/exp/interleave-pseudo-stop.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/interleave-restart.exp b/cts/scheduler/exp/interleave-restart.exp -index bd4b95c3d4..af1ad33b0d 100644 ---- a/cts/scheduler/exp/interleave-restart.exp -+++ b/cts/scheduler/exp/interleave-restart.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/interleave-stop.exp b/cts/scheduler/exp/interleave-stop.exp -index be08f8a384..95182a7c13 100644 ---- a/cts/scheduler/exp/interleave-stop.exp -+++ b/cts/scheduler/exp/interleave-stop.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/intervals.exp b/cts/scheduler/exp/intervals.exp -index e7fe8e6e8f..926de472a4 100644 ---- a/cts/scheduler/exp/intervals.exp -+++ b/cts/scheduler/exp/intervals.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/leftover-pending-monitor.exp b/cts/scheduler/exp/leftover-pending-monitor.exp -index 52619adeaf..65737ada29 100644 ---- a/cts/scheduler/exp/leftover-pending-monitor.exp -+++ b/cts/scheduler/exp/leftover-pending-monitor.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/load-stopped-loop-2.exp b/cts/scheduler/exp/load-stopped-loop-2.exp -index 9b64b90a97..ca518ee39e 100644 ---- a/cts/scheduler/exp/load-stopped-loop-2.exp -+++ b/cts/scheduler/exp/load-stopped-loop-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/load-stopped-loop.exp b/cts/scheduler/exp/load-stopped-loop.exp -index 7da86790ae..b0427a66d1 100644 ---- a/cts/scheduler/exp/load-stopped-loop.exp -+++ b/cts/scheduler/exp/load-stopped-loop.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/location-date-rules-1.exp b/cts/scheduler/exp/location-date-rules-1.exp -index a9cafbdf58..e1428e6321 100644 ---- a/cts/scheduler/exp/location-date-rules-1.exp -+++ b/cts/scheduler/exp/location-date-rules-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/location-date-rules-2.exp b/cts/scheduler/exp/location-date-rules-2.exp -index 67e89566f9..4064d08b59 100644 ---- a/cts/scheduler/exp/location-date-rules-2.exp -+++ b/cts/scheduler/exp/location-date-rules-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/location-sets-templates.exp b/cts/scheduler/exp/location-sets-templates.exp -index 4a3b39a304..6882b25e90 100644 ---- a/cts/scheduler/exp/location-sets-templates.exp -+++ b/cts/scheduler/exp/location-sets-templates.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/managed-0.exp b/cts/scheduler/exp/managed-0.exp -index d73a7aa657..861d67206c 100644 ---- a/cts/scheduler/exp/managed-0.exp -+++ b/cts/scheduler/exp/managed-0.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/managed-1.exp b/cts/scheduler/exp/managed-1.exp -index d73a7aa657..861d67206c 100644 ---- a/cts/scheduler/exp/managed-1.exp -+++ b/cts/scheduler/exp/managed-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/managed-2.exp b/cts/scheduler/exp/managed-2.exp -index a418b7dd93..4b056f1586 100644 ---- a/cts/scheduler/exp/managed-2.exp -+++ b/cts/scheduler/exp/managed-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-1.exp b/cts/scheduler/exp/migrate-1.exp -index 049337d85e..e199d85691 100644 ---- a/cts/scheduler/exp/migrate-1.exp -+++ b/cts/scheduler/exp/migrate-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-2.exp b/cts/scheduler/exp/migrate-2.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/migrate-2.exp -+++ b/cts/scheduler/exp/migrate-2.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/migrate-3.exp b/cts/scheduler/exp/migrate-3.exp -index fffcaf50bd..6031964078 100644 ---- a/cts/scheduler/exp/migrate-3.exp -+++ b/cts/scheduler/exp/migrate-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-4.exp b/cts/scheduler/exp/migrate-4.exp -index d420d8238d..16231f8ba6 100644 ---- a/cts/scheduler/exp/migrate-4.exp -+++ b/cts/scheduler/exp/migrate-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-5.exp b/cts/scheduler/exp/migrate-5.exp -index 313ed17a94..2cb4fe0e64 100644 ---- a/cts/scheduler/exp/migrate-5.exp -+++ b/cts/scheduler/exp/migrate-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-begin.exp b/cts/scheduler/exp/migrate-begin.exp -index e4e2dc2e67..3937c66d65 100644 ---- a/cts/scheduler/exp/migrate-begin.exp -+++ b/cts/scheduler/exp/migrate-begin.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-both-vms.exp b/cts/scheduler/exp/migrate-both-vms.exp -index b9e98961a2..fff13dbea2 100644 ---- a/cts/scheduler/exp/migrate-both-vms.exp -+++ b/cts/scheduler/exp/migrate-both-vms.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-fail-2.exp b/cts/scheduler/exp/migrate-fail-2.exp -index 0ed542dfae..e412f5fd21 100644 ---- a/cts/scheduler/exp/migrate-fail-2.exp -+++ b/cts/scheduler/exp/migrate-fail-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-fail-3.exp b/cts/scheduler/exp/migrate-fail-3.exp -index f4298470a0..d0f1ea9b7f 100644 ---- a/cts/scheduler/exp/migrate-fail-3.exp -+++ b/cts/scheduler/exp/migrate-fail-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-fail-4.exp b/cts/scheduler/exp/migrate-fail-4.exp -index 5759f6bf6d..45a0298a37 100644 ---- a/cts/scheduler/exp/migrate-fail-4.exp -+++ b/cts/scheduler/exp/migrate-fail-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-fail-5.exp b/cts/scheduler/exp/migrate-fail-5.exp -index 1a821c22fc..0c10e5beeb 100644 ---- a/cts/scheduler/exp/migrate-fail-5.exp -+++ b/cts/scheduler/exp/migrate-fail-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-fail-6.exp b/cts/scheduler/exp/migrate-fail-6.exp -index 856927d3c7..fb422979f1 100644 ---- a/cts/scheduler/exp/migrate-fail-6.exp -+++ b/cts/scheduler/exp/migrate-fail-6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-fail-7.exp b/cts/scheduler/exp/migrate-fail-7.exp -index 9ab8a5418d..562abb14df 100644 ---- a/cts/scheduler/exp/migrate-fail-7.exp -+++ b/cts/scheduler/exp/migrate-fail-7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-fail-8.exp b/cts/scheduler/exp/migrate-fail-8.exp -index d55759694a..c0365b277f 100644 ---- a/cts/scheduler/exp/migrate-fail-8.exp -+++ b/cts/scheduler/exp/migrate-fail-8.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-fail-9.exp b/cts/scheduler/exp/migrate-fail-9.exp -index 1a821c22fc..0c10e5beeb 100644 ---- a/cts/scheduler/exp/migrate-fail-9.exp -+++ b/cts/scheduler/exp/migrate-fail-9.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-fencing.exp b/cts/scheduler/exp/migrate-fencing.exp -index 4d4ac5303c..f79dea69c0 100644 ---- a/cts/scheduler/exp/migrate-fencing.exp -+++ b/cts/scheduler/exp/migrate-fencing.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-partial-1.exp b/cts/scheduler/exp/migrate-partial-1.exp -index e069ffa237..adf5876419 100644 ---- a/cts/scheduler/exp/migrate-partial-1.exp -+++ b/cts/scheduler/exp/migrate-partial-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-partial-2.exp b/cts/scheduler/exp/migrate-partial-2.exp -index c6a84127ac..3ab4443981 100644 ---- a/cts/scheduler/exp/migrate-partial-2.exp -+++ b/cts/scheduler/exp/migrate-partial-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-partial-3.exp b/cts/scheduler/exp/migrate-partial-3.exp -index 5ac51a2e2a..d29215675d 100644 ---- a/cts/scheduler/exp/migrate-partial-3.exp -+++ b/cts/scheduler/exp/migrate-partial-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-partial-4.exp b/cts/scheduler/exp/migrate-partial-4.exp -index fdf7baf240..2ad1160a97 100644 ---- a/cts/scheduler/exp/migrate-partial-4.exp -+++ b/cts/scheduler/exp/migrate-partial-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-shutdown.exp b/cts/scheduler/exp/migrate-shutdown.exp -index fce0b38808..6a7071fed8 100644 ---- a/cts/scheduler/exp/migrate-shutdown.exp -+++ b/cts/scheduler/exp/migrate-shutdown.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-start-complex.exp b/cts/scheduler/exp/migrate-start-complex.exp -index 34df5e23f7..0af97f4c75 100644 ---- a/cts/scheduler/exp/migrate-start-complex.exp -+++ b/cts/scheduler/exp/migrate-start-complex.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-start.exp b/cts/scheduler/exp/migrate-start.exp -index 465f987709..6fe80438c3 100644 ---- a/cts/scheduler/exp/migrate-start.exp -+++ b/cts/scheduler/exp/migrate-start.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-stop-complex.exp b/cts/scheduler/exp/migrate-stop-complex.exp -index a70cd34416..8b2b7b4f88 100644 ---- a/cts/scheduler/exp/migrate-stop-complex.exp -+++ b/cts/scheduler/exp/migrate-stop-complex.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-stop-start-complex.exp b/cts/scheduler/exp/migrate-stop-start-complex.exp -index 7abe04b328..04a67d836b 100644 ---- a/cts/scheduler/exp/migrate-stop-start-complex.exp -+++ b/cts/scheduler/exp/migrate-stop-start-complex.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-stop.exp b/cts/scheduler/exp/migrate-stop.exp -index 313ed17a94..2cb4fe0e64 100644 ---- a/cts/scheduler/exp/migrate-stop.exp -+++ b/cts/scheduler/exp/migrate-stop.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-stop_start.exp b/cts/scheduler/exp/migrate-stop_start.exp -index de786dc711..daf2c65c10 100644 ---- a/cts/scheduler/exp/migrate-stop_start.exp -+++ b/cts/scheduler/exp/migrate-stop_start.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migrate-success.exp b/cts/scheduler/exp/migrate-success.exp -index 2063ffb6aa..8789d21dbe 100644 ---- a/cts/scheduler/exp/migrate-success.exp -+++ b/cts/scheduler/exp/migrate-success.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migration-behind-migrating-remote.exp b/cts/scheduler/exp/migration-behind-migrating-remote.exp -index b289520ee0..c6060fc9b4 100644 ---- a/cts/scheduler/exp/migration-behind-migrating-remote.exp -+++ b/cts/scheduler/exp/migration-behind-migrating-remote.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migration-intermediary-cleaned.exp b/cts/scheduler/exp/migration-intermediary-cleaned.exp -index 8b9bb39945..135d86036e 100644 ---- a/cts/scheduler/exp/migration-intermediary-cleaned.exp -+++ b/cts/scheduler/exp/migration-intermediary-cleaned.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/migration-ping-pong.exp b/cts/scheduler/exp/migration-ping-pong.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/migration-ping-pong.exp -+++ b/cts/scheduler/exp/migration-ping-pong.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/minimal.exp b/cts/scheduler/exp/minimal.exp -index 02ed72e571..a35e3a0a4d 100644 ---- a/cts/scheduler/exp/minimal.exp -+++ b/cts/scheduler/exp/minimal.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/mon-rsc-1.exp b/cts/scheduler/exp/mon-rsc-1.exp -index 251ab6cc62..7a8e23f135 100644 ---- a/cts/scheduler/exp/mon-rsc-1.exp -+++ b/cts/scheduler/exp/mon-rsc-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/mon-rsc-2.exp b/cts/scheduler/exp/mon-rsc-2.exp -index cdb325e3be..2413b5297c 100644 ---- a/cts/scheduler/exp/mon-rsc-2.exp -+++ b/cts/scheduler/exp/mon-rsc-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/mon-rsc-3.exp b/cts/scheduler/exp/mon-rsc-3.exp -index 2a44cee5ce..54fb859ae8 100644 ---- a/cts/scheduler/exp/mon-rsc-3.exp -+++ b/cts/scheduler/exp/mon-rsc-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/mon-rsc-4.exp b/cts/scheduler/exp/mon-rsc-4.exp -index ee5c5859b3..f32c8899e3 100644 ---- a/cts/scheduler/exp/mon-rsc-4.exp -+++ b/cts/scheduler/exp/mon-rsc-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/monitor-onfail-restart.exp b/cts/scheduler/exp/monitor-onfail-restart.exp -index 4586dd293a..1619bd7710 100644 ---- a/cts/scheduler/exp/monitor-onfail-restart.exp -+++ b/cts/scheduler/exp/monitor-onfail-restart.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/monitor-onfail-stop.exp b/cts/scheduler/exp/monitor-onfail-stop.exp -index 63750ec8cf..3179f6f5fc 100644 ---- a/cts/scheduler/exp/monitor-onfail-stop.exp -+++ b/cts/scheduler/exp/monitor-onfail-stop.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/monitor-recovery.exp b/cts/scheduler/exp/monitor-recovery.exp -index 8af2528db9..530f0cd767 100644 ---- a/cts/scheduler/exp/monitor-recovery.exp -+++ b/cts/scheduler/exp/monitor-recovery.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/multi1.exp b/cts/scheduler/exp/multi1.exp -index 20163f1146..1b3f450f9e 100644 ---- a/cts/scheduler/exp/multi1.exp -+++ b/cts/scheduler/exp/multi1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/multiple-active-block-group.exp b/cts/scheduler/exp/multiple-active-block-group.exp -index ab0b4014c3..9627be18b9 100644 ---- a/cts/scheduler/exp/multiple-active-block-group.exp -+++ b/cts/scheduler/exp/multiple-active-block-group.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/multiple-monitor-one-failed.exp b/cts/scheduler/exp/multiple-monitor-one-failed.exp -index b8c14abb87..bad242d0f6 100644 ---- a/cts/scheduler/exp/multiple-monitor-one-failed.exp -+++ b/cts/scheduler/exp/multiple-monitor-one-failed.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/multiply-active-stonith.exp b/cts/scheduler/exp/multiply-active-stonith.exp -index 093e8b646c..a875b11753 100644 ---- a/cts/scheduler/exp/multiply-active-stonith.exp -+++ b/cts/scheduler/exp/multiply-active-stonith.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/nested-remote-recovery.exp b/cts/scheduler/exp/nested-remote-recovery.exp -index 78dca95d86..c29af3d34a 100644 ---- a/cts/scheduler/exp/nested-remote-recovery.exp -+++ b/cts/scheduler/exp/nested-remote-recovery.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/no-promote-on-unrunnable-guest.exp b/cts/scheduler/exp/no-promote-on-unrunnable-guest.exp -index 5eeb3d4997..4cd34e0f23 100644 ---- a/cts/scheduler/exp/no-promote-on-unrunnable-guest.exp -+++ b/cts/scheduler/exp/no-promote-on-unrunnable-guest.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/no_quorum_demote.exp b/cts/scheduler/exp/no_quorum_demote.exp -index 47fd0bbe10..b25acc3d0c 100644 ---- a/cts/scheduler/exp/no_quorum_demote.exp -+++ b/cts/scheduler/exp/no_quorum_demote.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/node-maintenance-1.exp b/cts/scheduler/exp/node-maintenance-1.exp -index 8e8ff5d8e8..fc031eb12a 100644 ---- a/cts/scheduler/exp/node-maintenance-1.exp -+++ b/cts/scheduler/exp/node-maintenance-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/node-maintenance-2.exp b/cts/scheduler/exp/node-maintenance-2.exp -index 543fea49f3..57538fd716 100644 ---- a/cts/scheduler/exp/node-maintenance-2.exp -+++ b/cts/scheduler/exp/node-maintenance-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/node-pending-timeout.exp b/cts/scheduler/exp/node-pending-timeout.exp -index e94812f031..e746098170 100644 ---- a/cts/scheduler/exp/node-pending-timeout.exp -+++ b/cts/scheduler/exp/node-pending-timeout.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/not-installed-agent.exp b/cts/scheduler/exp/not-installed-agent.exp -index bce79cbdc7..7e51792769 100644 ---- a/cts/scheduler/exp/not-installed-agent.exp -+++ b/cts/scheduler/exp/not-installed-agent.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/not-installed-tools.exp b/cts/scheduler/exp/not-installed-tools.exp -index 5438b9499c..95ca6d9d00 100644 ---- a/cts/scheduler/exp/not-installed-tools.exp -+++ b/cts/scheduler/exp/not-installed-tools.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/not-reschedule-unneeded-monitor.exp b/cts/scheduler/exp/not-reschedule-unneeded-monitor.exp -index 01f5835211..4b015a630e 100644 ---- a/cts/scheduler/exp/not-reschedule-unneeded-monitor.exp -+++ b/cts/scheduler/exp/not-reschedule-unneeded-monitor.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/notifs-for-unrunnable.exp b/cts/scheduler/exp/notifs-for-unrunnable.exp -index 221b99afc8..6aa57fedc7 100644 ---- a/cts/scheduler/exp/notifs-for-unrunnable.exp -+++ b/cts/scheduler/exp/notifs-for-unrunnable.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/notify-0.exp b/cts/scheduler/exp/notify-0.exp -index fb29069db9..e9effa0f2c 100644 ---- a/cts/scheduler/exp/notify-0.exp -+++ b/cts/scheduler/exp/notify-0.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/notify-1.exp b/cts/scheduler/exp/notify-1.exp -index fa35366571..f3760f6fed 100644 ---- a/cts/scheduler/exp/notify-1.exp -+++ b/cts/scheduler/exp/notify-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/notify-2.exp b/cts/scheduler/exp/notify-2.exp -index fa35366571..f3760f6fed 100644 ---- a/cts/scheduler/exp/notify-2.exp -+++ b/cts/scheduler/exp/notify-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/notify-3.exp b/cts/scheduler/exp/notify-3.exp -index fa396f40db..ada9ce5e45 100644 ---- a/cts/scheduler/exp/notify-3.exp -+++ b/cts/scheduler/exp/notify-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/notify-behind-stopping-remote.exp b/cts/scheduler/exp/notify-behind-stopping-remote.exp -index 7bcbe27f0e..4537d41ca8 100644 ---- a/cts/scheduler/exp/notify-behind-stopping-remote.exp -+++ b/cts/scheduler/exp/notify-behind-stopping-remote.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/novell-239079.exp b/cts/scheduler/exp/novell-239079.exp -index df897a10fe..c0509b6af8 100644 ---- a/cts/scheduler/exp/novell-239079.exp -+++ b/cts/scheduler/exp/novell-239079.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/novell-239082.exp b/cts/scheduler/exp/novell-239082.exp -index 5006320f17..927cc5ad4b 100644 ---- a/cts/scheduler/exp/novell-239082.exp -+++ b/cts/scheduler/exp/novell-239082.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/novell-239087.exp b/cts/scheduler/exp/novell-239087.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/novell-239087.exp -+++ b/cts/scheduler/exp/novell-239087.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/novell-251689.exp b/cts/scheduler/exp/novell-251689.exp -index 4cc31adc8e..7477c880e0 100644 ---- a/cts/scheduler/exp/novell-251689.exp -+++ b/cts/scheduler/exp/novell-251689.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/novell-252693-2.exp b/cts/scheduler/exp/novell-252693-2.exp -index 54dd77c666..35a71baf7f 100644 ---- a/cts/scheduler/exp/novell-252693-2.exp -+++ b/cts/scheduler/exp/novell-252693-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/novell-252693-3.exp b/cts/scheduler/exp/novell-252693-3.exp -index da756ccb1f..4258d3b460 100644 ---- a/cts/scheduler/exp/novell-252693-3.exp -+++ b/cts/scheduler/exp/novell-252693-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/novell-252693.exp b/cts/scheduler/exp/novell-252693.exp -index aa0e9fa1a7..57a0a8c418 100644 ---- a/cts/scheduler/exp/novell-252693.exp -+++ b/cts/scheduler/exp/novell-252693.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/nvpair-date-rules-1.exp b/cts/scheduler/exp/nvpair-date-rules-1.exp -index d61a0849be..ac596d7c19 100644 ---- a/cts/scheduler/exp/nvpair-date-rules-1.exp -+++ b/cts/scheduler/exp/nvpair-date-rules-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/nvpair-id-ref.exp b/cts/scheduler/exp/nvpair-id-ref.exp -index f1804d0512..27286c6ce6 100644 ---- a/cts/scheduler/exp/nvpair-id-ref.exp -+++ b/cts/scheduler/exp/nvpair-id-ref.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/obsolete-lrm-resource.exp b/cts/scheduler/exp/obsolete-lrm-resource.exp -index e4eeed016e..55c01246ad 100644 ---- a/cts/scheduler/exp/obsolete-lrm-resource.exp -+++ b/cts/scheduler/exp/obsolete-lrm-resource.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ocf_degraded-remap-ocf_ok.exp b/cts/scheduler/exp/ocf_degraded-remap-ocf_ok.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ocf_degraded-remap-ocf_ok.exp -+++ b/cts/scheduler/exp/ocf_degraded-remap-ocf_ok.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ocf_degraded_promoted-remap-ocf_ok.exp b/cts/scheduler/exp/ocf_degraded_promoted-remap-ocf_ok.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ocf_degraded_promoted-remap-ocf_ok.exp -+++ b/cts/scheduler/exp/ocf_degraded_promoted-remap-ocf_ok.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/on-fail-ignore.exp b/cts/scheduler/exp/on-fail-ignore.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/on-fail-ignore.exp -+++ b/cts/scheduler/exp/on-fail-ignore.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/on_fail_demote1.exp b/cts/scheduler/exp/on_fail_demote1.exp -index ebe1dd59ec..61eccd504e 100644 ---- a/cts/scheduler/exp/on_fail_demote1.exp -+++ b/cts/scheduler/exp/on_fail_demote1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/on_fail_demote2.exp b/cts/scheduler/exp/on_fail_demote2.exp -index 17c23e39c7..f7d16773fb 100644 ---- a/cts/scheduler/exp/on_fail_demote2.exp -+++ b/cts/scheduler/exp/on_fail_demote2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/on_fail_demote3.exp b/cts/scheduler/exp/on_fail_demote3.exp -index 1c46677d3b..e9f46f00ca 100644 ---- a/cts/scheduler/exp/on_fail_demote3.exp -+++ b/cts/scheduler/exp/on_fail_demote3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/on_fail_demote4.exp b/cts/scheduler/exp/on_fail_demote4.exp -index bf1d130ea6..fbdd0f3592 100644 ---- a/cts/scheduler/exp/on_fail_demote4.exp -+++ b/cts/scheduler/exp/on_fail_demote4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/one-or-more-0.exp b/cts/scheduler/exp/one-or-more-0.exp -index 724db86ceb..5f0c44abd9 100644 ---- a/cts/scheduler/exp/one-or-more-0.exp -+++ b/cts/scheduler/exp/one-or-more-0.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/one-or-more-1.exp b/cts/scheduler/exp/one-or-more-1.exp -index 5de19e50ff..b464e42d06 100644 ---- a/cts/scheduler/exp/one-or-more-1.exp -+++ b/cts/scheduler/exp/one-or-more-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/one-or-more-2.exp b/cts/scheduler/exp/one-or-more-2.exp -index 6d189c449a..7fc4bf03c3 100644 ---- a/cts/scheduler/exp/one-or-more-2.exp -+++ b/cts/scheduler/exp/one-or-more-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/one-or-more-3.exp b/cts/scheduler/exp/one-or-more-3.exp -index 810df09ca8..041cb9461b 100644 ---- a/cts/scheduler/exp/one-or-more-3.exp -+++ b/cts/scheduler/exp/one-or-more-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/one-or-more-4.exp b/cts/scheduler/exp/one-or-more-4.exp -index 3577e80daa..92a17785d1 100644 ---- a/cts/scheduler/exp/one-or-more-4.exp -+++ b/cts/scheduler/exp/one-or-more-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/one-or-more-5.exp b/cts/scheduler/exp/one-or-more-5.exp -index 6b9c180c34..3c467a0b33 100644 ---- a/cts/scheduler/exp/one-or-more-5.exp -+++ b/cts/scheduler/exp/one-or-more-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/one-or-more-6.exp b/cts/scheduler/exp/one-or-more-6.exp -index bc76cf67f3..7ff12b09ba 100644 ---- a/cts/scheduler/exp/one-or-more-6.exp -+++ b/cts/scheduler/exp/one-or-more-6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/one-or-more-7.exp b/cts/scheduler/exp/one-or-more-7.exp -index daaa82966b..24dae63d41 100644 ---- a/cts/scheduler/exp/one-or-more-7.exp -+++ b/cts/scheduler/exp/one-or-more-7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/one-or-more-unrunnable-instances.exp b/cts/scheduler/exp/one-or-more-unrunnable-instances.exp -index 73f9c18742..d153f631c5 100644 ---- a/cts/scheduler/exp/one-or-more-unrunnable-instances.exp -+++ b/cts/scheduler/exp/one-or-more-unrunnable-instances.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/op-defaults-2.exp b/cts/scheduler/exp/op-defaults-2.exp -index 4324fde097..e447f6c4e8 100644 ---- a/cts/scheduler/exp/op-defaults-2.exp -+++ b/cts/scheduler/exp/op-defaults-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/op-defaults-3.exp b/cts/scheduler/exp/op-defaults-3.exp -index 6d567dcd77..9f9043167a 100644 ---- a/cts/scheduler/exp/op-defaults-3.exp -+++ b/cts/scheduler/exp/op-defaults-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/op-defaults.exp b/cts/scheduler/exp/op-defaults.exp -index b81eacb075..e2f4eab7b5 100644 ---- a/cts/scheduler/exp/op-defaults.exp -+++ b/cts/scheduler/exp/op-defaults.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order-clone.exp b/cts/scheduler/exp/order-clone.exp -index 7168e8eeed..30cd8fc983 100644 ---- a/cts/scheduler/exp/order-clone.exp -+++ b/cts/scheduler/exp/order-clone.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order-expired-failure.exp b/cts/scheduler/exp/order-expired-failure.exp -index 4a504936b2..5b1b059770 100644 ---- a/cts/scheduler/exp/order-expired-failure.exp -+++ b/cts/scheduler/exp/order-expired-failure.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order-first-probes.exp b/cts/scheduler/exp/order-first-probes.exp -index 3ab8801b88..d33828d55d 100644 ---- a/cts/scheduler/exp/order-first-probes.exp -+++ b/cts/scheduler/exp/order-first-probes.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order-mandatory.exp b/cts/scheduler/exp/order-mandatory.exp -index ed428fbabf..c6bf0cfbba 100644 ---- a/cts/scheduler/exp/order-mandatory.exp -+++ b/cts/scheduler/exp/order-mandatory.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order-optional-keyword.exp b/cts/scheduler/exp/order-optional-keyword.exp -index 2e9af5adac..c5e0766e52 100644 ---- a/cts/scheduler/exp/order-optional-keyword.exp -+++ b/cts/scheduler/exp/order-optional-keyword.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order-optional.exp b/cts/scheduler/exp/order-optional.exp -index 2e9af5adac..c5e0766e52 100644 ---- a/cts/scheduler/exp/order-optional.exp -+++ b/cts/scheduler/exp/order-optional.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order-required.exp b/cts/scheduler/exp/order-required.exp -index ed428fbabf..c6bf0cfbba 100644 ---- a/cts/scheduler/exp/order-required.exp -+++ b/cts/scheduler/exp/order-required.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order-serialize-set.exp b/cts/scheduler/exp/order-serialize-set.exp -index a4e679cb05..ffc0e5b49f 100644 ---- a/cts/scheduler/exp/order-serialize-set.exp -+++ b/cts/scheduler/exp/order-serialize-set.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order-serialize.exp b/cts/scheduler/exp/order-serialize.exp -index 86184c1719..5d23b71da3 100644 ---- a/cts/scheduler/exp/order-serialize.exp -+++ b/cts/scheduler/exp/order-serialize.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order-sets.exp b/cts/scheduler/exp/order-sets.exp -index 424facf666..6eb1bfb1b0 100644 ---- a/cts/scheduler/exp/order-sets.exp -+++ b/cts/scheduler/exp/order-sets.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order-wrong-kind.exp b/cts/scheduler/exp/order-wrong-kind.exp -index b5f857de4d..0f8999202a 100644 ---- a/cts/scheduler/exp/order-wrong-kind.exp -+++ b/cts/scheduler/exp/order-wrong-kind.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order1.exp b/cts/scheduler/exp/order1.exp -index 2f988e5dcb..b1cfd3d645 100644 ---- a/cts/scheduler/exp/order1.exp -+++ b/cts/scheduler/exp/order1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order2.exp b/cts/scheduler/exp/order2.exp -index 8a3b8a887e..7ea61a9e27 100644 ---- a/cts/scheduler/exp/order2.exp -+++ b/cts/scheduler/exp/order2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order3.exp b/cts/scheduler/exp/order3.exp -index 056530bba9..76edf29c09 100644 ---- a/cts/scheduler/exp/order3.exp -+++ b/cts/scheduler/exp/order3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order4.exp b/cts/scheduler/exp/order4.exp -index 2f988e5dcb..b1cfd3d645 100644 ---- a/cts/scheduler/exp/order4.exp -+++ b/cts/scheduler/exp/order4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order5.exp b/cts/scheduler/exp/order5.exp -index ec4dc3e1a5..cb437729ed 100644 ---- a/cts/scheduler/exp/order5.exp -+++ b/cts/scheduler/exp/order5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order6.exp b/cts/scheduler/exp/order6.exp -index 7395010a60..23979ec5d4 100644 ---- a/cts/scheduler/exp/order6.exp -+++ b/cts/scheduler/exp/order6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order7.exp b/cts/scheduler/exp/order7.exp -index c9d2154a39..fc561dd205 100644 ---- a/cts/scheduler/exp/order7.exp -+++ b/cts/scheduler/exp/order7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order_constraint_stops_promoted.exp b/cts/scheduler/exp/order_constraint_stops_promoted.exp -index 05b0c2fc0f..aabe0472be 100644 ---- a/cts/scheduler/exp/order_constraint_stops_promoted.exp -+++ b/cts/scheduler/exp/order_constraint_stops_promoted.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/order_constraint_stops_unpromoted.exp b/cts/scheduler/exp/order_constraint_stops_unpromoted.exp -index 3e63ffdac8..61e149818b 100644 ---- a/cts/scheduler/exp/order_constraint_stops_unpromoted.exp -+++ b/cts/scheduler/exp/order_constraint_stops_unpromoted.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ordered-set-basic-startup.exp b/cts/scheduler/exp/ordered-set-basic-startup.exp -index 80bc7b69a3..27c99c25f2 100644 ---- a/cts/scheduler/exp/ordered-set-basic-startup.exp -+++ b/cts/scheduler/exp/ordered-set-basic-startup.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ordered-set-natural.exp b/cts/scheduler/exp/ordered-set-natural.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ordered-set-natural.exp -+++ b/cts/scheduler/exp/ordered-set-natural.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/origin.exp b/cts/scheduler/exp/origin.exp -index d774a2eadd..176b270ab5 100644 ---- a/cts/scheduler/exp/origin.exp -+++ b/cts/scheduler/exp/origin.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/orphan-0.exp b/cts/scheduler/exp/orphan-0.exp -index 8f3731b2d4..3e5572c8ad 100644 ---- a/cts/scheduler/exp/orphan-0.exp -+++ b/cts/scheduler/exp/orphan-0.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/orphan-1.exp b/cts/scheduler/exp/orphan-1.exp -index 3a87f638fb..e53d3a9689 100644 ---- a/cts/scheduler/exp/orphan-1.exp -+++ b/cts/scheduler/exp/orphan-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/orphan-2.exp b/cts/scheduler/exp/orphan-2.exp -index eb6eb0096e..68dc80fbc1 100644 ---- a/cts/scheduler/exp/orphan-2.exp -+++ b/cts/scheduler/exp/orphan-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/params-0.exp b/cts/scheduler/exp/params-0.exp -index 9abe3cc470..7701f46551 100644 ---- a/cts/scheduler/exp/params-0.exp -+++ b/cts/scheduler/exp/params-0.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/params-1.exp b/cts/scheduler/exp/params-1.exp -index 9e9f2342aa..b5bc27f2af 100644 ---- a/cts/scheduler/exp/params-1.exp -+++ b/cts/scheduler/exp/params-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/params-2.exp b/cts/scheduler/exp/params-2.exp -index 3833b74ace..785ae04b2a 100644 ---- a/cts/scheduler/exp/params-2.exp -+++ b/cts/scheduler/exp/params-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/params-3.exp b/cts/scheduler/exp/params-3.exp -index 5cccdec2c8..f930a9dba0 100644 ---- a/cts/scheduler/exp/params-3.exp -+++ b/cts/scheduler/exp/params-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/params-4.exp b/cts/scheduler/exp/params-4.exp -index 2880e65266..048ccda9fe 100644 ---- a/cts/scheduler/exp/params-4.exp -+++ b/cts/scheduler/exp/params-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/params-5.exp b/cts/scheduler/exp/params-5.exp -index 9e9f2342aa..b5bc27f2af 100644 ---- a/cts/scheduler/exp/params-5.exp -+++ b/cts/scheduler/exp/params-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/params-6.exp b/cts/scheduler/exp/params-6.exp -index 88447d10a7..d8a0c90ef8 100644 ---- a/cts/scheduler/exp/params-6.exp -+++ b/cts/scheduler/exp/params-6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/partial-live-migration-multiple-active.exp b/cts/scheduler/exp/partial-live-migration-multiple-active.exp -index 6b512f2d46..dabd3e08c6 100644 ---- a/cts/scheduler/exp/partial-live-migration-multiple-active.exp -+++ b/cts/scheduler/exp/partial-live-migration-multiple-active.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/partial-unmanaged-group.exp b/cts/scheduler/exp/partial-unmanaged-group.exp -index 62c849dcdf..0ba5fddba7 100644 ---- a/cts/scheduler/exp/partial-unmanaged-group.exp -+++ b/cts/scheduler/exp/partial-unmanaged-group.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/pending-node-no-uname.exp b/cts/scheduler/exp/pending-node-no-uname.exp -index 2c45756b51..b193baa558 100644 ---- a/cts/scheduler/exp/pending-node-no-uname.exp -+++ b/cts/scheduler/exp/pending-node-no-uname.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/per-node-attrs.exp b/cts/scheduler/exp/per-node-attrs.exp -index 9095ed894c..db7f11ade9 100644 ---- a/cts/scheduler/exp/per-node-attrs.exp -+++ b/cts/scheduler/exp/per-node-attrs.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/per-op-failcount.exp b/cts/scheduler/exp/per-op-failcount.exp -index 2a4eec5204..ad63436873 100644 ---- a/cts/scheduler/exp/per-op-failcount.exp -+++ b/cts/scheduler/exp/per-op-failcount.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/placement-capacity.exp b/cts/scheduler/exp/placement-capacity.exp -index a308bd0ead..85229c6877 100644 ---- a/cts/scheduler/exp/placement-capacity.exp -+++ b/cts/scheduler/exp/placement-capacity.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/placement-location.exp b/cts/scheduler/exp/placement-location.exp -index a308bd0ead..85229c6877 100644 ---- a/cts/scheduler/exp/placement-location.exp -+++ b/cts/scheduler/exp/placement-location.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/placement-priority.exp b/cts/scheduler/exp/placement-priority.exp -index 1ee5b62242..67c3b0b015 100644 ---- a/cts/scheduler/exp/placement-priority.exp -+++ b/cts/scheduler/exp/placement-priority.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/placement-stickiness.exp b/cts/scheduler/exp/placement-stickiness.exp -index a308bd0ead..85229c6877 100644 ---- a/cts/scheduler/exp/placement-stickiness.exp -+++ b/cts/scheduler/exp/placement-stickiness.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/primitive-with-group-with-clone.exp b/cts/scheduler/exp/primitive-with-group-with-clone.exp -index 1a2db5b535..ac0d5ee9e3 100644 ---- a/cts/scheduler/exp/primitive-with-group-with-clone.exp -+++ b/cts/scheduler/exp/primitive-with-group-with-clone.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/primitive-with-group-with-promoted.exp b/cts/scheduler/exp/primitive-with-group-with-promoted.exp -index ac7655b6ff..5f132fe9d8 100644 ---- a/cts/scheduler/exp/primitive-with-group-with-promoted.exp -+++ b/cts/scheduler/exp/primitive-with-group-with-promoted.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/primitive-with-unrunnable-group.exp b/cts/scheduler/exp/primitive-with-unrunnable-group.exp -index 2e4f0433b7..1f592760d9 100644 ---- a/cts/scheduler/exp/primitive-with-unrunnable-group.exp -+++ b/cts/scheduler/exp/primitive-with-unrunnable-group.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/priority-fencing-delay.exp b/cts/scheduler/exp/priority-fencing-delay.exp -index c6315a1280..828e359871 100644 ---- a/cts/scheduler/exp/priority-fencing-delay.exp -+++ b/cts/scheduler/exp/priority-fencing-delay.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/probe-0.exp b/cts/scheduler/exp/probe-0.exp -index d0ae096180..42bc521028 100644 ---- a/cts/scheduler/exp/probe-0.exp -+++ b/cts/scheduler/exp/probe-0.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/probe-1.exp b/cts/scheduler/exp/probe-1.exp -index 3c045364d5..a53f879a00 100644 ---- a/cts/scheduler/exp/probe-1.exp -+++ b/cts/scheduler/exp/probe-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/probe-2.exp b/cts/scheduler/exp/probe-2.exp -index 6dce2f4f51..d060034b0d 100644 ---- a/cts/scheduler/exp/probe-2.exp -+++ b/cts/scheduler/exp/probe-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/probe-3.exp b/cts/scheduler/exp/probe-3.exp -index 915363575f..122415b7ce 100644 ---- a/cts/scheduler/exp/probe-3.exp -+++ b/cts/scheduler/exp/probe-3.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/probe-4.exp b/cts/scheduler/exp/probe-4.exp -index 915363575f..122415b7ce 100644 ---- a/cts/scheduler/exp/probe-4.exp -+++ b/cts/scheduler/exp/probe-4.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/probe-pending-node.exp b/cts/scheduler/exp/probe-pending-node.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/probe-pending-node.exp -+++ b/cts/scheduler/exp/probe-pending-node.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/probe-target-of-failed-migrate_to-1.exp b/cts/scheduler/exp/probe-target-of-failed-migrate_to-1.exp -index 4c01d683d3..60185f2fc7 100644 ---- a/cts/scheduler/exp/probe-target-of-failed-migrate_to-1.exp -+++ b/cts/scheduler/exp/probe-target-of-failed-migrate_to-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/probe-target-of-failed-migrate_to-2.exp b/cts/scheduler/exp/probe-target-of-failed-migrate_to-2.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/probe-target-of-failed-migrate_to-2.exp -+++ b/cts/scheduler/exp/probe-target-of-failed-migrate_to-2.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/probe-timeout.exp b/cts/scheduler/exp/probe-timeout.exp -index de5c526466..63a664eec8 100644 ---- a/cts/scheduler/exp/probe-timeout.exp -+++ b/cts/scheduler/exp/probe-timeout.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-0.exp b/cts/scheduler/exp/promoted-0.exp -index 946bb4f661..4c8bf80577 100644 ---- a/cts/scheduler/exp/promoted-0.exp -+++ b/cts/scheduler/exp/promoted-0.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-1.exp b/cts/scheduler/exp/promoted-1.exp -index 37a4a1a649..b71965bb13 100644 ---- a/cts/scheduler/exp/promoted-1.exp -+++ b/cts/scheduler/exp/promoted-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-10.exp b/cts/scheduler/exp/promoted-10.exp -index acea7949c9..87be2f62c2 100644 ---- a/cts/scheduler/exp/promoted-10.exp -+++ b/cts/scheduler/exp/promoted-10.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-11.exp b/cts/scheduler/exp/promoted-11.exp -index 2861d1bf5c..4a2e89630b 100644 ---- a/cts/scheduler/exp/promoted-11.exp -+++ b/cts/scheduler/exp/promoted-11.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-12.exp b/cts/scheduler/exp/promoted-12.exp -index 66c1727df0..019ab86d06 100644 ---- a/cts/scheduler/exp/promoted-12.exp -+++ b/cts/scheduler/exp/promoted-12.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-13.exp b/cts/scheduler/exp/promoted-13.exp -index a071fca319..a4c3956b31 100644 ---- a/cts/scheduler/exp/promoted-13.exp -+++ b/cts/scheduler/exp/promoted-13.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-2.exp b/cts/scheduler/exp/promoted-2.exp -index e57587fea6..31ce6deb05 100644 ---- a/cts/scheduler/exp/promoted-2.exp -+++ b/cts/scheduler/exp/promoted-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-3.exp b/cts/scheduler/exp/promoted-3.exp -index 37a4a1a649..b71965bb13 100644 ---- a/cts/scheduler/exp/promoted-3.exp -+++ b/cts/scheduler/exp/promoted-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-4.exp b/cts/scheduler/exp/promoted-4.exp -index d8ce3114f1..c457492d4d 100644 ---- a/cts/scheduler/exp/promoted-4.exp -+++ b/cts/scheduler/exp/promoted-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-5.exp b/cts/scheduler/exp/promoted-5.exp -index 5c631e6afa..7bf9288688 100644 ---- a/cts/scheduler/exp/promoted-5.exp -+++ b/cts/scheduler/exp/promoted-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-6.exp b/cts/scheduler/exp/promoted-6.exp -index 886e42723e..e4e7190437 100644 ---- a/cts/scheduler/exp/promoted-6.exp -+++ b/cts/scheduler/exp/promoted-6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-7.exp b/cts/scheduler/exp/promoted-7.exp -index 37254434fb..f9724adbf8 100644 ---- a/cts/scheduler/exp/promoted-7.exp -+++ b/cts/scheduler/exp/promoted-7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-8.exp b/cts/scheduler/exp/promoted-8.exp -index bb411dc4d1..eefd8506db 100644 ---- a/cts/scheduler/exp/promoted-8.exp -+++ b/cts/scheduler/exp/promoted-8.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-9.exp b/cts/scheduler/exp/promoted-9.exp -index 345af8d2f4..901bf7119d 100644 ---- a/cts/scheduler/exp/promoted-9.exp -+++ b/cts/scheduler/exp/promoted-9.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-allow-start.exp b/cts/scheduler/exp/promoted-allow-start.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/promoted-allow-start.exp -+++ b/cts/scheduler/exp/promoted-allow-start.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/promoted-asymmetrical-order.exp b/cts/scheduler/exp/promoted-asymmetrical-order.exp -index 6ec284c24b..4ec75c7299 100644 ---- a/cts/scheduler/exp/promoted-asymmetrical-order.exp -+++ b/cts/scheduler/exp/promoted-asymmetrical-order.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-colocation.exp b/cts/scheduler/exp/promoted-colocation.exp -index 5af59ef79e..faf8f3d02e 100644 ---- a/cts/scheduler/exp/promoted-colocation.exp -+++ b/cts/scheduler/exp/promoted-colocation.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-demote-2.exp b/cts/scheduler/exp/promoted-demote-2.exp -index 7e5943a3ec..d21a5ff69f 100644 ---- a/cts/scheduler/exp/promoted-demote-2.exp -+++ b/cts/scheduler/exp/promoted-demote-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-demote-block.exp b/cts/scheduler/exp/promoted-demote-block.exp -index 24d0301301..794f4c56ca 100644 ---- a/cts/scheduler/exp/promoted-demote-block.exp -+++ b/cts/scheduler/exp/promoted-demote-block.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-demote.exp b/cts/scheduler/exp/promoted-demote.exp -index 177eb394b6..2df2140f4c 100644 ---- a/cts/scheduler/exp/promoted-demote.exp -+++ b/cts/scheduler/exp/promoted-demote.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-depend.exp b/cts/scheduler/exp/promoted-depend.exp -index 3c0d589204..89d30b37d2 100644 ---- a/cts/scheduler/exp/promoted-depend.exp -+++ b/cts/scheduler/exp/promoted-depend.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-dependent-ban.exp b/cts/scheduler/exp/promoted-dependent-ban.exp -index 228f17ea78..559d933c1f 100644 ---- a/cts/scheduler/exp/promoted-dependent-ban.exp -+++ b/cts/scheduler/exp/promoted-dependent-ban.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-failed-demote-2.exp b/cts/scheduler/exp/promoted-failed-demote-2.exp -index 81ed8df0be..1565a99836 100644 ---- a/cts/scheduler/exp/promoted-failed-demote-2.exp -+++ b/cts/scheduler/exp/promoted-failed-demote-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-failed-demote.exp b/cts/scheduler/exp/promoted-failed-demote.exp -index 69e6b39ab4..2451c202ef 100644 ---- a/cts/scheduler/exp/promoted-failed-demote.exp -+++ b/cts/scheduler/exp/promoted-failed-demote.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-group.exp b/cts/scheduler/exp/promoted-group.exp -index ef7e0937d0..171f099146 100644 ---- a/cts/scheduler/exp/promoted-group.exp -+++ b/cts/scheduler/exp/promoted-group.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-move.exp b/cts/scheduler/exp/promoted-move.exp -index 8abcd1cad6..4ae4d4d266 100644 ---- a/cts/scheduler/exp/promoted-move.exp -+++ b/cts/scheduler/exp/promoted-move.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-notify.exp b/cts/scheduler/exp/promoted-notify.exp -index 1ddc78d830..dad5db5e4f 100644 ---- a/cts/scheduler/exp/promoted-notify.exp -+++ b/cts/scheduler/exp/promoted-notify.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-ordering.exp b/cts/scheduler/exp/promoted-ordering.exp -index 430fbe64af..3835a47b57 100644 ---- a/cts/scheduler/exp/promoted-ordering.exp -+++ b/cts/scheduler/exp/promoted-ordering.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-partially-demoted-group.exp b/cts/scheduler/exp/promoted-partially-demoted-group.exp -index 4cf89e1a97..cd87291430 100644 ---- a/cts/scheduler/exp/promoted-partially-demoted-group.exp -+++ b/cts/scheduler/exp/promoted-partially-demoted-group.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-probed-score.exp b/cts/scheduler/exp/promoted-probed-score.exp -index 0952700b1f..5f1d617388 100644 ---- a/cts/scheduler/exp/promoted-probed-score.exp -+++ b/cts/scheduler/exp/promoted-probed-score.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-promotion-constraint.exp b/cts/scheduler/exp/promoted-promotion-constraint.exp -index 88ed2fcc31..3c61f6e292 100644 ---- a/cts/scheduler/exp/promoted-promotion-constraint.exp -+++ b/cts/scheduler/exp/promoted-promotion-constraint.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-pseudo.exp b/cts/scheduler/exp/promoted-pseudo.exp -index 839ea0892e..a712ac362d 100644 ---- a/cts/scheduler/exp/promoted-pseudo.exp -+++ b/cts/scheduler/exp/promoted-pseudo.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-reattach.exp b/cts/scheduler/exp/promoted-reattach.exp -index 263f6071bf..fa3be62737 100644 ---- a/cts/scheduler/exp/promoted-reattach.exp -+++ b/cts/scheduler/exp/promoted-reattach.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-role.exp b/cts/scheduler/exp/promoted-role.exp -index 09ace88dc0..fb09a31869 100644 ---- a/cts/scheduler/exp/promoted-role.exp -+++ b/cts/scheduler/exp/promoted-role.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-score-startup.exp b/cts/scheduler/exp/promoted-score-startup.exp -index 5ad369d137..671067041b 100644 ---- a/cts/scheduler/exp/promoted-score-startup.exp -+++ b/cts/scheduler/exp/promoted-score-startup.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-stop.exp b/cts/scheduler/exp/promoted-stop.exp -index 3bef5e6eac..d9bc24b8f1 100644 ---- a/cts/scheduler/exp/promoted-stop.exp -+++ b/cts/scheduler/exp/promoted-stop.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-unmanaged-monitor.exp b/cts/scheduler/exp/promoted-unmanaged-monitor.exp -index bd53d1fb29..0e07531c39 100644 ---- a/cts/scheduler/exp/promoted-unmanaged-monitor.exp -+++ b/cts/scheduler/exp/promoted-unmanaged-monitor.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted-with-blocked.exp b/cts/scheduler/exp/promoted-with-blocked.exp -index 540963bcd7..2b2fc6e26f 100644 ---- a/cts/scheduler/exp/promoted-with-blocked.exp -+++ b/cts/scheduler/exp/promoted-with-blocked.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/promoted_monitor_restart.exp b/cts/scheduler/exp/promoted_monitor_restart.exp -index fff4400f90..fc9d306aa6 100644 ---- a/cts/scheduler/exp/promoted_monitor_restart.exp -+++ b/cts/scheduler/exp/promoted_monitor_restart.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/quorum-1.exp b/cts/scheduler/exp/quorum-1.exp -index 9390e9e3f9..02f25dfece 100644 ---- a/cts/scheduler/exp/quorum-1.exp -+++ b/cts/scheduler/exp/quorum-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/quorum-2.exp b/cts/scheduler/exp/quorum-2.exp -index 2542dbdb20..fafac9ad54 100644 ---- a/cts/scheduler/exp/quorum-2.exp -+++ b/cts/scheduler/exp/quorum-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/quorum-3.exp b/cts/scheduler/exp/quorum-3.exp -index 3d098e9751..5cc7974075 100644 ---- a/cts/scheduler/exp/quorum-3.exp -+++ b/cts/scheduler/exp/quorum-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/quorum-4.exp b/cts/scheduler/exp/quorum-4.exp -index ed273bc5c2..b6a634b91c 100644 ---- a/cts/scheduler/exp/quorum-4.exp -+++ b/cts/scheduler/exp/quorum-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/quorum-5.exp b/cts/scheduler/exp/quorum-5.exp -index 8372eda202..67a6978f3c 100644 ---- a/cts/scheduler/exp/quorum-5.exp -+++ b/cts/scheduler/exp/quorum-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/quorum-6.exp b/cts/scheduler/exp/quorum-6.exp -index 263e33c3bb..621065a89d 100644 ---- a/cts/scheduler/exp/quorum-6.exp -+++ b/cts/scheduler/exp/quorum-6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rebalance-unique-clones.exp b/cts/scheduler/exp/rebalance-unique-clones.exp -index a5d8ee6364..f3ebe6fec7 100644 ---- a/cts/scheduler/exp/rebalance-unique-clones.exp -+++ b/cts/scheduler/exp/rebalance-unique-clones.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-node-1.exp b/cts/scheduler/exp/rec-node-1.exp -index 5803a0486a..b899fe9bb4 100644 ---- a/cts/scheduler/exp/rec-node-1.exp -+++ b/cts/scheduler/exp/rec-node-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-node-10.exp b/cts/scheduler/exp/rec-node-10.exp -index 7dd8a26e4e..e1cbcd35af 100644 ---- a/cts/scheduler/exp/rec-node-10.exp -+++ b/cts/scheduler/exp/rec-node-10.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-node-11.exp b/cts/scheduler/exp/rec-node-11.exp -index d48cf29413..8ae83e982a 100644 ---- a/cts/scheduler/exp/rec-node-11.exp -+++ b/cts/scheduler/exp/rec-node-11.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-node-12.exp b/cts/scheduler/exp/rec-node-12.exp -index 404b2759e5..fd3c7a0923 100644 ---- a/cts/scheduler/exp/rec-node-12.exp -+++ b/cts/scheduler/exp/rec-node-12.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-node-13.exp b/cts/scheduler/exp/rec-node-13.exp -index cfcca4f589..5b5d2aa329 100644 ---- a/cts/scheduler/exp/rec-node-13.exp -+++ b/cts/scheduler/exp/rec-node-13.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-node-14.exp b/cts/scheduler/exp/rec-node-14.exp -index dafcc51c53..c3f87339ca 100644 ---- a/cts/scheduler/exp/rec-node-14.exp -+++ b/cts/scheduler/exp/rec-node-14.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-node-15.exp b/cts/scheduler/exp/rec-node-15.exp -index c3ee5b750b..2477e3ff5b 100644 ---- a/cts/scheduler/exp/rec-node-15.exp -+++ b/cts/scheduler/exp/rec-node-15.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-node-2.exp b/cts/scheduler/exp/rec-node-2.exp -index 1e7d49ae9a..3e622031da 100644 ---- a/cts/scheduler/exp/rec-node-2.exp -+++ b/cts/scheduler/exp/rec-node-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-node-3.exp b/cts/scheduler/exp/rec-node-3.exp -index 5803a0486a..b899fe9bb4 100644 ---- a/cts/scheduler/exp/rec-node-3.exp -+++ b/cts/scheduler/exp/rec-node-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-node-4.exp b/cts/scheduler/exp/rec-node-4.exp -index 2186040d8d..1044ef25dc 100644 ---- a/cts/scheduler/exp/rec-node-4.exp -+++ b/cts/scheduler/exp/rec-node-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-node-5.exp b/cts/scheduler/exp/rec-node-5.exp -index 96bb9922a7..aee9ca38e1 100644 ---- a/cts/scheduler/exp/rec-node-5.exp -+++ b/cts/scheduler/exp/rec-node-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-node-6.exp b/cts/scheduler/exp/rec-node-6.exp -index 2186040d8d..1044ef25dc 100644 ---- a/cts/scheduler/exp/rec-node-6.exp -+++ b/cts/scheduler/exp/rec-node-6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-node-7.exp b/cts/scheduler/exp/rec-node-7.exp -index 2186040d8d..1044ef25dc 100644 ---- a/cts/scheduler/exp/rec-node-7.exp -+++ b/cts/scheduler/exp/rec-node-7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-node-8.exp b/cts/scheduler/exp/rec-node-8.exp -index 3dfc34359e..707748d653 100644 ---- a/cts/scheduler/exp/rec-node-8.exp -+++ b/cts/scheduler/exp/rec-node-8.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-node-9.exp b/cts/scheduler/exp/rec-node-9.exp -index ad6ec28e8b..c0695c6585 100644 ---- a/cts/scheduler/exp/rec-node-9.exp -+++ b/cts/scheduler/exp/rec-node-9.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-rsc-0.exp b/cts/scheduler/exp/rec-rsc-0.exp -index 3d4fa121c3..24fbe4e1bf 100644 ---- a/cts/scheduler/exp/rec-rsc-0.exp -+++ b/cts/scheduler/exp/rec-rsc-0.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-rsc-1.exp b/cts/scheduler/exp/rec-rsc-1.exp -index c132ad0fab..582456eeb8 100644 ---- a/cts/scheduler/exp/rec-rsc-1.exp -+++ b/cts/scheduler/exp/rec-rsc-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-rsc-2.exp b/cts/scheduler/exp/rec-rsc-2.exp -index 170f1e25ae..b637349610 100644 ---- a/cts/scheduler/exp/rec-rsc-2.exp -+++ b/cts/scheduler/exp/rec-rsc-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-rsc-3.exp b/cts/scheduler/exp/rec-rsc-3.exp -index 0aa20fea0c..7b8739687b 100644 ---- a/cts/scheduler/exp/rec-rsc-3.exp -+++ b/cts/scheduler/exp/rec-rsc-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-rsc-4.exp b/cts/scheduler/exp/rec-rsc-4.exp -index d08e890aa4..3aedd6688b 100644 ---- a/cts/scheduler/exp/rec-rsc-4.exp -+++ b/cts/scheduler/exp/rec-rsc-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-rsc-5.exp b/cts/scheduler/exp/rec-rsc-5.exp -index 0e8e6b4b77..e6ab4d0c12 100644 ---- a/cts/scheduler/exp/rec-rsc-5.exp -+++ b/cts/scheduler/exp/rec-rsc-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-rsc-6.exp b/cts/scheduler/exp/rec-rsc-6.exp -index 20163f1146..1b3f450f9e 100644 ---- a/cts/scheduler/exp/rec-rsc-6.exp -+++ b/cts/scheduler/exp/rec-rsc-6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-rsc-7.exp b/cts/scheduler/exp/rec-rsc-7.exp -index 3d4fa121c3..24fbe4e1bf 100644 ---- a/cts/scheduler/exp/rec-rsc-7.exp -+++ b/cts/scheduler/exp/rec-rsc-7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rec-rsc-8.exp b/cts/scheduler/exp/rec-rsc-8.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/rec-rsc-8.exp -+++ b/cts/scheduler/exp/rec-rsc-8.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/rec-rsc-9.exp b/cts/scheduler/exp/rec-rsc-9.exp -index dece3fea5e..b9533b3b0a 100644 ---- a/cts/scheduler/exp/rec-rsc-9.exp -+++ b/cts/scheduler/exp/rec-rsc-9.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/reload-becomes-restart.exp b/cts/scheduler/exp/reload-becomes-restart.exp -index 224b8d2bcc..97e276d7aa 100644 ---- a/cts/scheduler/exp/reload-becomes-restart.exp -+++ b/cts/scheduler/exp/reload-becomes-restart.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-connection-shutdown.exp b/cts/scheduler/exp/remote-connection-shutdown.exp -index f3c3424faa..2e04bc73af 100644 ---- a/cts/scheduler/exp/remote-connection-shutdown.exp -+++ b/cts/scheduler/exp/remote-connection-shutdown.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-connection-unrecoverable.exp b/cts/scheduler/exp/remote-connection-unrecoverable.exp -index d57c106627..41357742b0 100644 ---- a/cts/scheduler/exp/remote-connection-unrecoverable.exp -+++ b/cts/scheduler/exp/remote-connection-unrecoverable.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-disable.exp b/cts/scheduler/exp/remote-disable.exp -index 60900021d3..1dcf911668 100644 ---- a/cts/scheduler/exp/remote-disable.exp -+++ b/cts/scheduler/exp/remote-disable.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-fence-before-reconnect.exp b/cts/scheduler/exp/remote-fence-before-reconnect.exp -index f506f85435..26ed3d0791 100644 ---- a/cts/scheduler/exp/remote-fence-before-reconnect.exp -+++ b/cts/scheduler/exp/remote-fence-before-reconnect.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-fence-unclean-3.exp b/cts/scheduler/exp/remote-fence-unclean-3.exp -index a51cea91d4..66ed145dc5 100644 ---- a/cts/scheduler/exp/remote-fence-unclean-3.exp -+++ b/cts/scheduler/exp/remote-fence-unclean-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-fence-unclean.exp b/cts/scheduler/exp/remote-fence-unclean.exp -index 35bd59005a..9645ed4e1d 100644 ---- a/cts/scheduler/exp/remote-fence-unclean.exp -+++ b/cts/scheduler/exp/remote-fence-unclean.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-fence-unclean2.exp b/cts/scheduler/exp/remote-fence-unclean2.exp -index 2f55ad8dcd..f052956a2b 100644 ---- a/cts/scheduler/exp/remote-fence-unclean2.exp -+++ b/cts/scheduler/exp/remote-fence-unclean2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-move.exp b/cts/scheduler/exp/remote-move.exp -index c48eba8bff..87a3d4fa86 100644 ---- a/cts/scheduler/exp/remote-move.exp -+++ b/cts/scheduler/exp/remote-move.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-orphaned.exp b/cts/scheduler/exp/remote-orphaned.exp -index a19d2ec5b4..384fc37b46 100644 ---- a/cts/scheduler/exp/remote-orphaned.exp -+++ b/cts/scheduler/exp/remote-orphaned.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-orphaned2.exp b/cts/scheduler/exp/remote-orphaned2.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/remote-orphaned2.exp -+++ b/cts/scheduler/exp/remote-orphaned2.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/remote-partial-migrate.exp b/cts/scheduler/exp/remote-partial-migrate.exp -index b0120ec429..6778964b04 100644 ---- a/cts/scheduler/exp/remote-partial-migrate.exp -+++ b/cts/scheduler/exp/remote-partial-migrate.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-partial-migrate2.exp b/cts/scheduler/exp/remote-partial-migrate2.exp -index 473b5c3fc6..deed9e0cd8 100644 ---- a/cts/scheduler/exp/remote-partial-migrate2.exp -+++ b/cts/scheduler/exp/remote-partial-migrate2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-probe-disable.exp b/cts/scheduler/exp/remote-probe-disable.exp -index a45b1bf7d8..bc00fd40c9 100644 ---- a/cts/scheduler/exp/remote-probe-disable.exp -+++ b/cts/scheduler/exp/remote-probe-disable.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-reconnect-delay.exp b/cts/scheduler/exp/remote-reconnect-delay.exp -index 6f9a285612..d42d970a47 100644 ---- a/cts/scheduler/exp/remote-reconnect-delay.exp -+++ b/cts/scheduler/exp/remote-reconnect-delay.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-recover-all.exp b/cts/scheduler/exp/remote-recover-all.exp -index 50477196d5..3a0745f77e 100644 ---- a/cts/scheduler/exp/remote-recover-all.exp -+++ b/cts/scheduler/exp/remote-recover-all.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-recover-connection.exp b/cts/scheduler/exp/remote-recover-connection.exp -index 9685627c1e..e208355b92 100644 ---- a/cts/scheduler/exp/remote-recover-connection.exp -+++ b/cts/scheduler/exp/remote-recover-connection.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-recover-fail.exp b/cts/scheduler/exp/remote-recover-fail.exp -index d23141922b..3a1d39c8ae 100644 ---- a/cts/scheduler/exp/remote-recover-fail.exp -+++ b/cts/scheduler/exp/remote-recover-fail.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-recover-no-resources.exp b/cts/scheduler/exp/remote-recover-no-resources.exp -index af8c941c90..49339cc04a 100644 ---- a/cts/scheduler/exp/remote-recover-no-resources.exp -+++ b/cts/scheduler/exp/remote-recover-no-resources.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-recover-unknown.exp b/cts/scheduler/exp/remote-recover-unknown.exp -index f08b349c65..dc9d134a49 100644 ---- a/cts/scheduler/exp/remote-recover-unknown.exp -+++ b/cts/scheduler/exp/remote-recover-unknown.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-recover.exp b/cts/scheduler/exp/remote-recover.exp -index 918db8d4fe..248c1f8912 100644 ---- a/cts/scheduler/exp/remote-recover.exp -+++ b/cts/scheduler/exp/remote-recover.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-recovery.exp b/cts/scheduler/exp/remote-recovery.exp -index 9685627c1e..e208355b92 100644 ---- a/cts/scheduler/exp/remote-recovery.exp -+++ b/cts/scheduler/exp/remote-recovery.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-stale-node-entry.exp b/cts/scheduler/exp/remote-stale-node-entry.exp -index a48ef709c7..ffcc42d1dc 100644 ---- a/cts/scheduler/exp/remote-stale-node-entry.exp -+++ b/cts/scheduler/exp/remote-stale-node-entry.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-start-fail.exp b/cts/scheduler/exp/remote-start-fail.exp -index a71c9085f4..096facadb0 100644 ---- a/cts/scheduler/exp/remote-start-fail.exp -+++ b/cts/scheduler/exp/remote-start-fail.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-startup-probes.exp b/cts/scheduler/exp/remote-startup-probes.exp -index 8ad95e975a..4bd09ebcce 100644 ---- a/cts/scheduler/exp/remote-startup-probes.exp -+++ b/cts/scheduler/exp/remote-startup-probes.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-startup.exp b/cts/scheduler/exp/remote-startup.exp -index 636154eb2a..9ef465e91e 100644 ---- a/cts/scheduler/exp/remote-startup.exp -+++ b/cts/scheduler/exp/remote-startup.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/remote-unclean2.exp b/cts/scheduler/exp/remote-unclean2.exp -index 11e6fe11ec..a3f9819c30 100644 ---- a/cts/scheduler/exp/remote-unclean2.exp -+++ b/cts/scheduler/exp/remote-unclean2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/reprobe-target_rc.exp b/cts/scheduler/exp/reprobe-target_rc.exp -index 8fc082d111..bf55a77544 100644 ---- a/cts/scheduler/exp/reprobe-target_rc.exp -+++ b/cts/scheduler/exp/reprobe-target_rc.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/resource-discovery.exp b/cts/scheduler/exp/resource-discovery.exp -index f62c257711..23e383ec5a 100644 ---- a/cts/scheduler/exp/resource-discovery.exp -+++ b/cts/scheduler/exp/resource-discovery.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/restart-with-extra-op-params.exp b/cts/scheduler/exp/restart-with-extra-op-params.exp -index 6d119b66ec..6e4e5a11a1 100644 ---- a/cts/scheduler/exp/restart-with-extra-op-params.exp -+++ b/cts/scheduler/exp/restart-with-extra-op-params.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/route-remote-notify.exp b/cts/scheduler/exp/route-remote-notify.exp -index 57e228b376..1a0aa7b506 100644 ---- a/cts/scheduler/exp/route-remote-notify.exp -+++ b/cts/scheduler/exp/route-remote-notify.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rsc-defaults-2.exp b/cts/scheduler/exp/rsc-defaults-2.exp -index e9e1b5f447..b0ab2e8157 100644 ---- a/cts/scheduler/exp/rsc-defaults-2.exp -+++ b/cts/scheduler/exp/rsc-defaults-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rsc-defaults.exp b/cts/scheduler/exp/rsc-defaults.exp -index 11cb218209..a6e719b20f 100644 ---- a/cts/scheduler/exp/rsc-defaults.exp -+++ b/cts/scheduler/exp/rsc-defaults.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rsc-discovery-per-node.exp b/cts/scheduler/exp/rsc-discovery-per-node.exp -index 967f0a4eba..dd37cb1ebf 100644 ---- a/cts/scheduler/exp/rsc-discovery-per-node.exp -+++ b/cts/scheduler/exp/rsc-discovery-per-node.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rsc-maintenance.exp b/cts/scheduler/exp/rsc-maintenance.exp -index ede1171adb..bbda7b1d54 100644 ---- a/cts/scheduler/exp/rsc-maintenance.exp -+++ b/cts/scheduler/exp/rsc-maintenance.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rsc-sets-clone-1.exp b/cts/scheduler/exp/rsc-sets-clone-1.exp -index bdca03ae1a..c0305908a7 100644 ---- a/cts/scheduler/exp/rsc-sets-clone-1.exp -+++ b/cts/scheduler/exp/rsc-sets-clone-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rsc-sets-clone.exp b/cts/scheduler/exp/rsc-sets-clone.exp -index d1ff52f300..0aefb4a8e4 100644 ---- a/cts/scheduler/exp/rsc-sets-clone.exp -+++ b/cts/scheduler/exp/rsc-sets-clone.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rsc-sets-promoted.exp b/cts/scheduler/exp/rsc-sets-promoted.exp -index 7ed1232b94..fef2fcfbd3 100644 ---- a/cts/scheduler/exp/rsc-sets-promoted.exp -+++ b/cts/scheduler/exp/rsc-sets-promoted.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rsc-sets-seq-false.exp b/cts/scheduler/exp/rsc-sets-seq-false.exp -index b3f22c06da..245c934f05 100644 ---- a/cts/scheduler/exp/rsc-sets-seq-false.exp -+++ b/cts/scheduler/exp/rsc-sets-seq-false.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rsc-sets-seq-true.exp b/cts/scheduler/exp/rsc-sets-seq-true.exp -index 5d2f371660..04d62183f0 100644 ---- a/cts/scheduler/exp/rsc-sets-seq-true.exp -+++ b/cts/scheduler/exp/rsc-sets-seq-true.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rsc_dep1.exp b/cts/scheduler/exp/rsc_dep1.exp -index bb301d1510..41cb1b77e5 100644 ---- a/cts/scheduler/exp/rsc_dep1.exp -+++ b/cts/scheduler/exp/rsc_dep1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rsc_dep10.exp b/cts/scheduler/exp/rsc_dep10.exp -index d0c8ee34d2..e444b048ad 100644 ---- a/cts/scheduler/exp/rsc_dep10.exp -+++ b/cts/scheduler/exp/rsc_dep10.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rsc_dep2.exp b/cts/scheduler/exp/rsc_dep2.exp -index 9bd4915990..3baf7c6671 100644 ---- a/cts/scheduler/exp/rsc_dep2.exp -+++ b/cts/scheduler/exp/rsc_dep2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rsc_dep3.exp b/cts/scheduler/exp/rsc_dep3.exp -index d3b80140f3..d71d6b094d 100644 ---- a/cts/scheduler/exp/rsc_dep3.exp -+++ b/cts/scheduler/exp/rsc_dep3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rsc_dep4.exp b/cts/scheduler/exp/rsc_dep4.exp -index 1e7bec68ab..0458c055da 100644 ---- a/cts/scheduler/exp/rsc_dep4.exp -+++ b/cts/scheduler/exp/rsc_dep4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rsc_dep5.exp b/cts/scheduler/exp/rsc_dep5.exp -index 0847f94fe6..66daa64107 100644 ---- a/cts/scheduler/exp/rsc_dep5.exp -+++ b/cts/scheduler/exp/rsc_dep5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rsc_dep7.exp b/cts/scheduler/exp/rsc_dep7.exp -index b18a9016f0..f0bcadf9f3 100644 ---- a/cts/scheduler/exp/rsc_dep7.exp -+++ b/cts/scheduler/exp/rsc_dep7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rsc_dep8.exp b/cts/scheduler/exp/rsc_dep8.exp -index 9bd4915990..3baf7c6671 100644 ---- a/cts/scheduler/exp/rsc_dep8.exp -+++ b/cts/scheduler/exp/rsc_dep8.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rule-dbl-as-auto-number-match.exp b/cts/scheduler/exp/rule-dbl-as-auto-number-match.exp -index 002df23ce6..c15a8515e8 100644 ---- a/cts/scheduler/exp/rule-dbl-as-auto-number-match.exp -+++ b/cts/scheduler/exp/rule-dbl-as-auto-number-match.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rule-dbl-as-auto-number-no-match.exp b/cts/scheduler/exp/rule-dbl-as-auto-number-no-match.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/rule-dbl-as-auto-number-no-match.exp -+++ b/cts/scheduler/exp/rule-dbl-as-auto-number-no-match.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/rule-dbl-as-integer-match.exp b/cts/scheduler/exp/rule-dbl-as-integer-match.exp -index 002df23ce6..c15a8515e8 100644 ---- a/cts/scheduler/exp/rule-dbl-as-integer-match.exp -+++ b/cts/scheduler/exp/rule-dbl-as-integer-match.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rule-dbl-as-integer-no-match.exp b/cts/scheduler/exp/rule-dbl-as-integer-no-match.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/rule-dbl-as-integer-no-match.exp -+++ b/cts/scheduler/exp/rule-dbl-as-integer-no-match.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/rule-dbl-as-number-match.exp b/cts/scheduler/exp/rule-dbl-as-number-match.exp -index 002df23ce6..c15a8515e8 100644 ---- a/cts/scheduler/exp/rule-dbl-as-number-match.exp -+++ b/cts/scheduler/exp/rule-dbl-as-number-match.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rule-dbl-as-number-no-match.exp b/cts/scheduler/exp/rule-dbl-as-number-no-match.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/rule-dbl-as-number-no-match.exp -+++ b/cts/scheduler/exp/rule-dbl-as-number-no-match.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/rule-dbl-parse-fail-default-str-match.exp b/cts/scheduler/exp/rule-dbl-parse-fail-default-str-match.exp -index 002df23ce6..c15a8515e8 100644 ---- a/cts/scheduler/exp/rule-dbl-parse-fail-default-str-match.exp -+++ b/cts/scheduler/exp/rule-dbl-parse-fail-default-str-match.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rule-dbl-parse-fail-default-str-no-match.exp b/cts/scheduler/exp/rule-dbl-parse-fail-default-str-no-match.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/rule-dbl-parse-fail-default-str-no-match.exp -+++ b/cts/scheduler/exp/rule-dbl-parse-fail-default-str-no-match.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/rule-int-as-auto-integer-match.exp b/cts/scheduler/exp/rule-int-as-auto-integer-match.exp -index 002df23ce6..c15a8515e8 100644 ---- a/cts/scheduler/exp/rule-int-as-auto-integer-match.exp -+++ b/cts/scheduler/exp/rule-int-as-auto-integer-match.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rule-int-as-auto-integer-no-match.exp b/cts/scheduler/exp/rule-int-as-auto-integer-no-match.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/rule-int-as-auto-integer-no-match.exp -+++ b/cts/scheduler/exp/rule-int-as-auto-integer-no-match.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/rule-int-as-integer-match.exp b/cts/scheduler/exp/rule-int-as-integer-match.exp -index 002df23ce6..c15a8515e8 100644 ---- a/cts/scheduler/exp/rule-int-as-integer-match.exp -+++ b/cts/scheduler/exp/rule-int-as-integer-match.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rule-int-as-integer-no-match.exp b/cts/scheduler/exp/rule-int-as-integer-no-match.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/rule-int-as-integer-no-match.exp -+++ b/cts/scheduler/exp/rule-int-as-integer-no-match.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/rule-int-as-number-match.exp b/cts/scheduler/exp/rule-int-as-number-match.exp -index 002df23ce6..c15a8515e8 100644 ---- a/cts/scheduler/exp/rule-int-as-number-match.exp -+++ b/cts/scheduler/exp/rule-int-as-number-match.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rule-int-as-number-no-match.exp b/cts/scheduler/exp/rule-int-as-number-no-match.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/rule-int-as-number-no-match.exp -+++ b/cts/scheduler/exp/rule-int-as-number-no-match.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/rule-int-parse-fail-default-str-match.exp b/cts/scheduler/exp/rule-int-parse-fail-default-str-match.exp -index 002df23ce6..c15a8515e8 100644 ---- a/cts/scheduler/exp/rule-int-parse-fail-default-str-match.exp -+++ b/cts/scheduler/exp/rule-int-parse-fail-default-str-match.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/rule-int-parse-fail-default-str-no-match.exp b/cts/scheduler/exp/rule-int-parse-fail-default-str-no-match.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/rule-int-parse-fail-default-str-no-match.exp -+++ b/cts/scheduler/exp/rule-int-parse-fail-default-str-no-match.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/shutdown-lock-expiration.exp b/cts/scheduler/exp/shutdown-lock-expiration.exp -index 9941333b90..a8aa51bee2 100644 ---- a/cts/scheduler/exp/shutdown-lock-expiration.exp -+++ b/cts/scheduler/exp/shutdown-lock-expiration.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/shutdown-lock.exp b/cts/scheduler/exp/shutdown-lock.exp -index e8bf9d869d..6ce795403c 100644 ---- a/cts/scheduler/exp/shutdown-lock.exp -+++ b/cts/scheduler/exp/shutdown-lock.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/shutdown-maintenance-node.exp b/cts/scheduler/exp/shutdown-maintenance-node.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/shutdown-maintenance-node.exp -+++ b/cts/scheduler/exp/shutdown-maintenance-node.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/simple1.exp b/cts/scheduler/exp/simple1.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/simple1.exp -+++ b/cts/scheduler/exp/simple1.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/simple11.exp b/cts/scheduler/exp/simple11.exp -index bf9506ee85..2163247c49 100644 ---- a/cts/scheduler/exp/simple11.exp -+++ b/cts/scheduler/exp/simple11.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/simple12.exp b/cts/scheduler/exp/simple12.exp -index e7c87d7a3f..890dac12db 100644 ---- a/cts/scheduler/exp/simple12.exp -+++ b/cts/scheduler/exp/simple12.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/simple2.exp b/cts/scheduler/exp/simple2.exp -index 367ce6eba2..4050f8ac2f 100644 ---- a/cts/scheduler/exp/simple2.exp -+++ b/cts/scheduler/exp/simple2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/simple3.exp b/cts/scheduler/exp/simple3.exp -index e89ec609ef..42990b00db 100644 ---- a/cts/scheduler/exp/simple3.exp -+++ b/cts/scheduler/exp/simple3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/simple4.exp b/cts/scheduler/exp/simple4.exp -index e01f429590..f0e8a63410 100644 ---- a/cts/scheduler/exp/simple4.exp -+++ b/cts/scheduler/exp/simple4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/simple6.exp b/cts/scheduler/exp/simple6.exp -index bcb68f80d0..bf802d5f91 100644 ---- a/cts/scheduler/exp/simple6.exp -+++ b/cts/scheduler/exp/simple6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/simple7.exp b/cts/scheduler/exp/simple7.exp -index c11c46162a..186fab91ab 100644 ---- a/cts/scheduler/exp/simple7.exp -+++ b/cts/scheduler/exp/simple7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/simple8.exp b/cts/scheduler/exp/simple8.exp -index 1728f133c7..842de2e001 100644 ---- a/cts/scheduler/exp/simple8.exp -+++ b/cts/scheduler/exp/simple8.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/site-specific-params.exp b/cts/scheduler/exp/site-specific-params.exp -index 6644ecb2a2..47ab1b0b2c 100644 ---- a/cts/scheduler/exp/site-specific-params.exp -+++ b/cts/scheduler/exp/site-specific-params.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/standby.exp b/cts/scheduler/exp/standby.exp -index 56cda3e472..736c858546 100644 ---- a/cts/scheduler/exp/standby.exp -+++ b/cts/scheduler/exp/standby.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/start-then-stop-with-unfence.exp b/cts/scheduler/exp/start-then-stop-with-unfence.exp -index 69cfb63de7..c659279bb9 100644 ---- a/cts/scheduler/exp/start-then-stop-with-unfence.exp -+++ b/cts/scheduler/exp/start-then-stop-with-unfence.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stonith-0.exp b/cts/scheduler/exp/stonith-0.exp -index 5dcce21d21..9463b906cb 100644 ---- a/cts/scheduler/exp/stonith-0.exp -+++ b/cts/scheduler/exp/stonith-0.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stonith-1.exp b/cts/scheduler/exp/stonith-1.exp -index dea6d0329b..5460a4cd25 100644 ---- a/cts/scheduler/exp/stonith-1.exp -+++ b/cts/scheduler/exp/stonith-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stonith-2.exp b/cts/scheduler/exp/stonith-2.exp -index 0c15f8344e..2bf7888e1c 100644 ---- a/cts/scheduler/exp/stonith-2.exp -+++ b/cts/scheduler/exp/stonith-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stonith-3.exp b/cts/scheduler/exp/stonith-3.exp -index 09e13147f0..8f15cb3f51 100644 ---- a/cts/scheduler/exp/stonith-3.exp -+++ b/cts/scheduler/exp/stonith-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stonith-4.exp b/cts/scheduler/exp/stonith-4.exp -index 4c9cc86944..7b0045023b 100644 ---- a/cts/scheduler/exp/stonith-4.exp -+++ b/cts/scheduler/exp/stonith-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stop-all-resources.exp b/cts/scheduler/exp/stop-all-resources.exp -index 478a28b302..4288b21602 100644 ---- a/cts/scheduler/exp/stop-all-resources.exp -+++ b/cts/scheduler/exp/stop-all-resources.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stop-failure-no-fencing.exp b/cts/scheduler/exp/stop-failure-no-fencing.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/stop-failure-no-fencing.exp -+++ b/cts/scheduler/exp/stop-failure-no-fencing.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/stop-failure-no-quorum.exp b/cts/scheduler/exp/stop-failure-no-quorum.exp -index 8f6d252e05..8134a88088 100644 ---- a/cts/scheduler/exp/stop-failure-no-quorum.exp -+++ b/cts/scheduler/exp/stop-failure-no-quorum.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stop-failure-with-fencing.exp b/cts/scheduler/exp/stop-failure-with-fencing.exp -index 6d0e6af399..1247e78774 100644 ---- a/cts/scheduler/exp/stop-failure-with-fencing.exp -+++ b/cts/scheduler/exp/stop-failure-with-fencing.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stop-unexpected-2.exp b/cts/scheduler/exp/stop-unexpected-2.exp -index 258053c089..bf1863feff 100644 ---- a/cts/scheduler/exp/stop-unexpected-2.exp -+++ b/cts/scheduler/exp/stop-unexpected-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stop-unexpected.exp b/cts/scheduler/exp/stop-unexpected.exp -index 1f94532f71..f74401f804 100644 ---- a/cts/scheduler/exp/stop-unexpected.exp -+++ b/cts/scheduler/exp/stop-unexpected.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stopped-monitor-00.exp b/cts/scheduler/exp/stopped-monitor-00.exp -index 31c5d85e8a..707cf6685c 100644 ---- a/cts/scheduler/exp/stopped-monitor-00.exp -+++ b/cts/scheduler/exp/stopped-monitor-00.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stopped-monitor-01.exp b/cts/scheduler/exp/stopped-monitor-01.exp -index 13a3911943..6897bd8f81 100644 ---- a/cts/scheduler/exp/stopped-monitor-01.exp -+++ b/cts/scheduler/exp/stopped-monitor-01.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stopped-monitor-02.exp b/cts/scheduler/exp/stopped-monitor-02.exp -index 6acbcc7d06..91b8d90c61 100644 ---- a/cts/scheduler/exp/stopped-monitor-02.exp -+++ b/cts/scheduler/exp/stopped-monitor-02.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stopped-monitor-03.exp b/cts/scheduler/exp/stopped-monitor-03.exp -index a192301e43..2a9310a56a 100644 ---- a/cts/scheduler/exp/stopped-monitor-03.exp -+++ b/cts/scheduler/exp/stopped-monitor-03.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stopped-monitor-04.exp b/cts/scheduler/exp/stopped-monitor-04.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/stopped-monitor-04.exp -+++ b/cts/scheduler/exp/stopped-monitor-04.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/stopped-monitor-05.exp b/cts/scheduler/exp/stopped-monitor-05.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/stopped-monitor-05.exp -+++ b/cts/scheduler/exp/stopped-monitor-05.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/stopped-monitor-06.exp b/cts/scheduler/exp/stopped-monitor-06.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/stopped-monitor-06.exp -+++ b/cts/scheduler/exp/stopped-monitor-06.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/stopped-monitor-07.exp b/cts/scheduler/exp/stopped-monitor-07.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/stopped-monitor-07.exp -+++ b/cts/scheduler/exp/stopped-monitor-07.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/stopped-monitor-08.exp b/cts/scheduler/exp/stopped-monitor-08.exp -index f885bafbe3..ba2372fb0a 100644 ---- a/cts/scheduler/exp/stopped-monitor-08.exp -+++ b/cts/scheduler/exp/stopped-monitor-08.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stopped-monitor-09.exp b/cts/scheduler/exp/stopped-monitor-09.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/stopped-monitor-09.exp -+++ b/cts/scheduler/exp/stopped-monitor-09.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/stopped-monitor-10.exp b/cts/scheduler/exp/stopped-monitor-10.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/stopped-monitor-10.exp -+++ b/cts/scheduler/exp/stopped-monitor-10.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/stopped-monitor-11.exp b/cts/scheduler/exp/stopped-monitor-11.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/stopped-monitor-11.exp -+++ b/cts/scheduler/exp/stopped-monitor-11.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/stopped-monitor-12.exp b/cts/scheduler/exp/stopped-monitor-12.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/stopped-monitor-12.exp -+++ b/cts/scheduler/exp/stopped-monitor-12.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/stopped-monitor-20.exp b/cts/scheduler/exp/stopped-monitor-20.exp -index 3776be844f..585c1482be 100644 ---- a/cts/scheduler/exp/stopped-monitor-20.exp -+++ b/cts/scheduler/exp/stopped-monitor-20.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stopped-monitor-21.exp b/cts/scheduler/exp/stopped-monitor-21.exp -index 5ba941b8c9..03d5c37307 100644 ---- a/cts/scheduler/exp/stopped-monitor-21.exp -+++ b/cts/scheduler/exp/stopped-monitor-21.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stopped-monitor-22.exp b/cts/scheduler/exp/stopped-monitor-22.exp -index ffb767e4be..3b65e823b2 100644 ---- a/cts/scheduler/exp/stopped-monitor-22.exp -+++ b/cts/scheduler/exp/stopped-monitor-22.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stopped-monitor-23.exp b/cts/scheduler/exp/stopped-monitor-23.exp -index 96d376e0d7..a94f879f79 100644 ---- a/cts/scheduler/exp/stopped-monitor-23.exp -+++ b/cts/scheduler/exp/stopped-monitor-23.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stopped-monitor-24.exp b/cts/scheduler/exp/stopped-monitor-24.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/stopped-monitor-24.exp -+++ b/cts/scheduler/exp/stopped-monitor-24.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/stopped-monitor-25.exp b/cts/scheduler/exp/stopped-monitor-25.exp -index 059e808bf2..2c5a143ee9 100644 ---- a/cts/scheduler/exp/stopped-monitor-25.exp -+++ b/cts/scheduler/exp/stopped-monitor-25.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stopped-monitor-26.exp b/cts/scheduler/exp/stopped-monitor-26.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/stopped-monitor-26.exp -+++ b/cts/scheduler/exp/stopped-monitor-26.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/stopped-monitor-27.exp b/cts/scheduler/exp/stopped-monitor-27.exp -index 059e808bf2..2c5a143ee9 100644 ---- a/cts/scheduler/exp/stopped-monitor-27.exp -+++ b/cts/scheduler/exp/stopped-monitor-27.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stopped-monitor-30.exp b/cts/scheduler/exp/stopped-monitor-30.exp -index 039b60de61..2f2c6c69bb 100644 ---- a/cts/scheduler/exp/stopped-monitor-30.exp -+++ b/cts/scheduler/exp/stopped-monitor-30.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/stopped-monitor-31.exp b/cts/scheduler/exp/stopped-monitor-31.exp -index 3500eda6ae..3fac4a1e52 100644 ---- a/cts/scheduler/exp/stopped-monitor-31.exp -+++ b/cts/scheduler/exp/stopped-monitor-31.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/suicide-needed-inquorate.exp b/cts/scheduler/exp/suicide-needed-inquorate.exp -index bd0b69cc16..51858b7b53 100644 ---- a/cts/scheduler/exp/suicide-needed-inquorate.exp -+++ b/cts/scheduler/exp/suicide-needed-inquorate.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/suicide-not-needed-initial-quorum.exp b/cts/scheduler/exp/suicide-not-needed-initial-quorum.exp -index 4a9dc66f8c..fd7a6647c7 100644 ---- a/cts/scheduler/exp/suicide-not-needed-initial-quorum.exp -+++ b/cts/scheduler/exp/suicide-not-needed-initial-quorum.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/suicide-not-needed-never-quorate.exp b/cts/scheduler/exp/suicide-not-needed-never-quorate.exp -index 0af7e3ee76..b717b1bff7 100644 ---- a/cts/scheduler/exp/suicide-not-needed-never-quorate.exp -+++ b/cts/scheduler/exp/suicide-not-needed-never-quorate.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/suicide-not-needed-quorate.exp b/cts/scheduler/exp/suicide-not-needed-quorate.exp -index 4a9dc66f8c..fd7a6647c7 100644 ---- a/cts/scheduler/exp/suicide-not-needed-quorate.exp -+++ b/cts/scheduler/exp/suicide-not-needed-quorate.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/systemhealth1.exp b/cts/scheduler/exp/systemhealth1.exp -index 8d16fed235..1c1abffcfb 100644 ---- a/cts/scheduler/exp/systemhealth1.exp -+++ b/cts/scheduler/exp/systemhealth1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/systemhealth2.exp b/cts/scheduler/exp/systemhealth2.exp -index a4109219c9..c7f5981a19 100644 ---- a/cts/scheduler/exp/systemhealth2.exp -+++ b/cts/scheduler/exp/systemhealth2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/systemhealth3.exp b/cts/scheduler/exp/systemhealth3.exp -index a4109219c9..c7f5981a19 100644 ---- a/cts/scheduler/exp/systemhealth3.exp -+++ b/cts/scheduler/exp/systemhealth3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/systemhealthm1.exp b/cts/scheduler/exp/systemhealthm1.exp -index 8d16fed235..1c1abffcfb 100644 ---- a/cts/scheduler/exp/systemhealthm1.exp -+++ b/cts/scheduler/exp/systemhealthm1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/systemhealthm2.exp b/cts/scheduler/exp/systemhealthm2.exp -index a4109219c9..c7f5981a19 100644 ---- a/cts/scheduler/exp/systemhealthm2.exp -+++ b/cts/scheduler/exp/systemhealthm2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/systemhealthm3.exp b/cts/scheduler/exp/systemhealthm3.exp -index c17102b464..f38d2b5035 100644 ---- a/cts/scheduler/exp/systemhealthm3.exp -+++ b/cts/scheduler/exp/systemhealthm3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/systemhealthn1.exp b/cts/scheduler/exp/systemhealthn1.exp -index 8d16fed235..1c1abffcfb 100644 ---- a/cts/scheduler/exp/systemhealthn1.exp -+++ b/cts/scheduler/exp/systemhealthn1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/systemhealthn2.exp b/cts/scheduler/exp/systemhealthn2.exp -index a4109219c9..c7f5981a19 100644 ---- a/cts/scheduler/exp/systemhealthn2.exp -+++ b/cts/scheduler/exp/systemhealthn2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/systemhealthn3.exp b/cts/scheduler/exp/systemhealthn3.exp -index a4109219c9..c7f5981a19 100644 ---- a/cts/scheduler/exp/systemhealthn3.exp -+++ b/cts/scheduler/exp/systemhealthn3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/systemhealtho1.exp b/cts/scheduler/exp/systemhealtho1.exp -index 8d16fed235..1c1abffcfb 100644 ---- a/cts/scheduler/exp/systemhealtho1.exp -+++ b/cts/scheduler/exp/systemhealtho1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/systemhealtho2.exp b/cts/scheduler/exp/systemhealtho2.exp -index c17102b464..f38d2b5035 100644 ---- a/cts/scheduler/exp/systemhealtho2.exp -+++ b/cts/scheduler/exp/systemhealtho2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/systemhealtho3.exp b/cts/scheduler/exp/systemhealtho3.exp -index c17102b464..f38d2b5035 100644 ---- a/cts/scheduler/exp/systemhealtho3.exp -+++ b/cts/scheduler/exp/systemhealtho3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/systemhealthp1.exp b/cts/scheduler/exp/systemhealthp1.exp -index 8d16fed235..1c1abffcfb 100644 ---- a/cts/scheduler/exp/systemhealthp1.exp -+++ b/cts/scheduler/exp/systemhealthp1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/systemhealthp2.exp b/cts/scheduler/exp/systemhealthp2.exp -index 5f652ab1d8..51d9650b16 100644 ---- a/cts/scheduler/exp/systemhealthp2.exp -+++ b/cts/scheduler/exp/systemhealthp2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/systemhealthp3.exp b/cts/scheduler/exp/systemhealthp3.exp -index c17102b464..f38d2b5035 100644 ---- a/cts/scheduler/exp/systemhealthp3.exp -+++ b/cts/scheduler/exp/systemhealthp3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/tags-coloc-order-1.exp b/cts/scheduler/exp/tags-coloc-order-1.exp -index cf4599e94b..80c834e4fc 100644 ---- a/cts/scheduler/exp/tags-coloc-order-1.exp -+++ b/cts/scheduler/exp/tags-coloc-order-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/tags-coloc-order-2.exp b/cts/scheduler/exp/tags-coloc-order-2.exp -index a2149bbbce..fd7b4312fc 100644 ---- a/cts/scheduler/exp/tags-coloc-order-2.exp -+++ b/cts/scheduler/exp/tags-coloc-order-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/tags-location.exp b/cts/scheduler/exp/tags-location.exp -index 4a3b39a304..6882b25e90 100644 ---- a/cts/scheduler/exp/tags-location.exp -+++ b/cts/scheduler/exp/tags-location.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/tags-ticket.exp b/cts/scheduler/exp/tags-ticket.exp -index 8aad924b95..3749150dc8 100644 ---- a/cts/scheduler/exp/tags-ticket.exp -+++ b/cts/scheduler/exp/tags-ticket.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/target-0.exp b/cts/scheduler/exp/target-0.exp -index 9abe3cc470..7701f46551 100644 ---- a/cts/scheduler/exp/target-0.exp -+++ b/cts/scheduler/exp/target-0.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/target-1.exp b/cts/scheduler/exp/target-1.exp -index 980f68c3d4..6fb78ed3ed 100644 ---- a/cts/scheduler/exp/target-1.exp -+++ b/cts/scheduler/exp/target-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/target-2.exp b/cts/scheduler/exp/target-2.exp -index 4ce8fba27e..f0ba4a7d55 100644 ---- a/cts/scheduler/exp/target-2.exp -+++ b/cts/scheduler/exp/target-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/template-1.exp b/cts/scheduler/exp/template-1.exp -index 732094c636..38d18bc8ba 100644 ---- a/cts/scheduler/exp/template-1.exp -+++ b/cts/scheduler/exp/template-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/template-2.exp b/cts/scheduler/exp/template-2.exp -index 698038f8a7..b11b704305 100644 ---- a/cts/scheduler/exp/template-2.exp -+++ b/cts/scheduler/exp/template-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/template-3.exp b/cts/scheduler/exp/template-3.exp -index 9c65b5d0f2..37436006f3 100644 ---- a/cts/scheduler/exp/template-3.exp -+++ b/cts/scheduler/exp/template-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/template-clone-group.exp b/cts/scheduler/exp/template-clone-group.exp -index dfb63d06ea..be5a596843 100644 ---- a/cts/scheduler/exp/template-clone-group.exp -+++ b/cts/scheduler/exp/template-clone-group.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/template-clone-primitive.exp b/cts/scheduler/exp/template-clone-primitive.exp -index 7cd26d5299..58a3b9661c 100644 ---- a/cts/scheduler/exp/template-clone-primitive.exp -+++ b/cts/scheduler/exp/template-clone-primitive.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/template-coloc-1.exp b/cts/scheduler/exp/template-coloc-1.exp -index e659fb929e..5a55d0f081 100644 ---- a/cts/scheduler/exp/template-coloc-1.exp -+++ b/cts/scheduler/exp/template-coloc-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/template-coloc-2.exp b/cts/scheduler/exp/template-coloc-2.exp -index e659fb929e..5a55d0f081 100644 ---- a/cts/scheduler/exp/template-coloc-2.exp -+++ b/cts/scheduler/exp/template-coloc-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/template-coloc-3.exp b/cts/scheduler/exp/template-coloc-3.exp -index 555a1bb0d4..1cd2b0953e 100644 ---- a/cts/scheduler/exp/template-coloc-3.exp -+++ b/cts/scheduler/exp/template-coloc-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/template-order-1.exp b/cts/scheduler/exp/template-order-1.exp -index 992c8f1c56..23e74d29b7 100644 ---- a/cts/scheduler/exp/template-order-1.exp -+++ b/cts/scheduler/exp/template-order-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/template-order-2.exp b/cts/scheduler/exp/template-order-2.exp -index ab929724cc..d8b6c04836 100644 ---- a/cts/scheduler/exp/template-order-2.exp -+++ b/cts/scheduler/exp/template-order-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/template-order-3.exp b/cts/scheduler/exp/template-order-3.exp -index e3f4621b3d..419dee0eea 100644 ---- a/cts/scheduler/exp/template-order-3.exp -+++ b/cts/scheduler/exp/template-order-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/template-rsc-sets-1.exp b/cts/scheduler/exp/template-rsc-sets-1.exp -index 24c086babe..1d76f3bd7b 100644 ---- a/cts/scheduler/exp/template-rsc-sets-1.exp -+++ b/cts/scheduler/exp/template-rsc-sets-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/template-rsc-sets-2.exp b/cts/scheduler/exp/template-rsc-sets-2.exp -index d7fdd5c611..3c93e4a930 100644 ---- a/cts/scheduler/exp/template-rsc-sets-2.exp -+++ b/cts/scheduler/exp/template-rsc-sets-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/template-rsc-sets-3.exp b/cts/scheduler/exp/template-rsc-sets-3.exp -index 24c086babe..1d76f3bd7b 100644 ---- a/cts/scheduler/exp/template-rsc-sets-3.exp -+++ b/cts/scheduler/exp/template-rsc-sets-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/template-rsc-sets-4.exp b/cts/scheduler/exp/template-rsc-sets-4.exp -index 3015823adf..66014f3458 100644 ---- a/cts/scheduler/exp/template-rsc-sets-4.exp -+++ b/cts/scheduler/exp/template-rsc-sets-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/template-ticket.exp b/cts/scheduler/exp/template-ticket.exp -index 3015823adf..66014f3458 100644 ---- a/cts/scheduler/exp/template-ticket.exp -+++ b/cts/scheduler/exp/template-ticket.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-1.exp b/cts/scheduler/exp/ticket-clone-1.exp -index 24b9304669..e74a2d020b 100644 ---- a/cts/scheduler/exp/ticket-clone-1.exp -+++ b/cts/scheduler/exp/ticket-clone-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-10.exp b/cts/scheduler/exp/ticket-clone-10.exp -index 24b9304669..e74a2d020b 100644 ---- a/cts/scheduler/exp/ticket-clone-10.exp -+++ b/cts/scheduler/exp/ticket-clone-10.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-11.exp b/cts/scheduler/exp/ticket-clone-11.exp -index 4f3a5f60d7..e68bf3a12b 100644 ---- a/cts/scheduler/exp/ticket-clone-11.exp -+++ b/cts/scheduler/exp/ticket-clone-11.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-12.exp b/cts/scheduler/exp/ticket-clone-12.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-clone-12.exp -+++ b/cts/scheduler/exp/ticket-clone-12.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-clone-13.exp b/cts/scheduler/exp/ticket-clone-13.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-clone-13.exp -+++ b/cts/scheduler/exp/ticket-clone-13.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-clone-14.exp b/cts/scheduler/exp/ticket-clone-14.exp -index 05413c9e82..19c58738a3 100644 ---- a/cts/scheduler/exp/ticket-clone-14.exp -+++ b/cts/scheduler/exp/ticket-clone-14.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-15.exp b/cts/scheduler/exp/ticket-clone-15.exp -index 05413c9e82..19c58738a3 100644 ---- a/cts/scheduler/exp/ticket-clone-15.exp -+++ b/cts/scheduler/exp/ticket-clone-15.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-16.exp b/cts/scheduler/exp/ticket-clone-16.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-clone-16.exp -+++ b/cts/scheduler/exp/ticket-clone-16.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-clone-17.exp b/cts/scheduler/exp/ticket-clone-17.exp -index 05413c9e82..19c58738a3 100644 ---- a/cts/scheduler/exp/ticket-clone-17.exp -+++ b/cts/scheduler/exp/ticket-clone-17.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-18.exp b/cts/scheduler/exp/ticket-clone-18.exp -index 05413c9e82..19c58738a3 100644 ---- a/cts/scheduler/exp/ticket-clone-18.exp -+++ b/cts/scheduler/exp/ticket-clone-18.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-19.exp b/cts/scheduler/exp/ticket-clone-19.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-clone-19.exp -+++ b/cts/scheduler/exp/ticket-clone-19.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-clone-2.exp b/cts/scheduler/exp/ticket-clone-2.exp -index 4f3a5f60d7..e68bf3a12b 100644 ---- a/cts/scheduler/exp/ticket-clone-2.exp -+++ b/cts/scheduler/exp/ticket-clone-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-20.exp b/cts/scheduler/exp/ticket-clone-20.exp -index 05413c9e82..19c58738a3 100644 ---- a/cts/scheduler/exp/ticket-clone-20.exp -+++ b/cts/scheduler/exp/ticket-clone-20.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-21.exp b/cts/scheduler/exp/ticket-clone-21.exp -index 8d7003b558..a78245bd04 100644 ---- a/cts/scheduler/exp/ticket-clone-21.exp -+++ b/cts/scheduler/exp/ticket-clone-21.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-22.exp b/cts/scheduler/exp/ticket-clone-22.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-clone-22.exp -+++ b/cts/scheduler/exp/ticket-clone-22.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-clone-23.exp b/cts/scheduler/exp/ticket-clone-23.exp -index 05413c9e82..19c58738a3 100644 ---- a/cts/scheduler/exp/ticket-clone-23.exp -+++ b/cts/scheduler/exp/ticket-clone-23.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-24.exp b/cts/scheduler/exp/ticket-clone-24.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-clone-24.exp -+++ b/cts/scheduler/exp/ticket-clone-24.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-clone-3.exp b/cts/scheduler/exp/ticket-clone-3.exp -index 05413c9e82..19c58738a3 100644 ---- a/cts/scheduler/exp/ticket-clone-3.exp -+++ b/cts/scheduler/exp/ticket-clone-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-4.exp b/cts/scheduler/exp/ticket-clone-4.exp -index 24b9304669..e74a2d020b 100644 ---- a/cts/scheduler/exp/ticket-clone-4.exp -+++ b/cts/scheduler/exp/ticket-clone-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-5.exp b/cts/scheduler/exp/ticket-clone-5.exp -index 4f3a5f60d7..e68bf3a12b 100644 ---- a/cts/scheduler/exp/ticket-clone-5.exp -+++ b/cts/scheduler/exp/ticket-clone-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-6.exp b/cts/scheduler/exp/ticket-clone-6.exp -index 05413c9e82..19c58738a3 100644 ---- a/cts/scheduler/exp/ticket-clone-6.exp -+++ b/cts/scheduler/exp/ticket-clone-6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-7.exp b/cts/scheduler/exp/ticket-clone-7.exp -index 24b9304669..e74a2d020b 100644 ---- a/cts/scheduler/exp/ticket-clone-7.exp -+++ b/cts/scheduler/exp/ticket-clone-7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-8.exp b/cts/scheduler/exp/ticket-clone-8.exp -index 4f3a5f60d7..e68bf3a12b 100644 ---- a/cts/scheduler/exp/ticket-clone-8.exp -+++ b/cts/scheduler/exp/ticket-clone-8.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-clone-9.exp b/cts/scheduler/exp/ticket-clone-9.exp -index 8d7003b558..a78245bd04 100644 ---- a/cts/scheduler/exp/ticket-clone-9.exp -+++ b/cts/scheduler/exp/ticket-clone-9.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-1.exp b/cts/scheduler/exp/ticket-group-1.exp -index de9e84b9ff..afe7015233 100644 ---- a/cts/scheduler/exp/ticket-group-1.exp -+++ b/cts/scheduler/exp/ticket-group-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-10.exp b/cts/scheduler/exp/ticket-group-10.exp -index de9e84b9ff..afe7015233 100644 ---- a/cts/scheduler/exp/ticket-group-10.exp -+++ b/cts/scheduler/exp/ticket-group-10.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-11.exp b/cts/scheduler/exp/ticket-group-11.exp -index 5a7f812470..d958ce5b43 100644 ---- a/cts/scheduler/exp/ticket-group-11.exp -+++ b/cts/scheduler/exp/ticket-group-11.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-12.exp b/cts/scheduler/exp/ticket-group-12.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-group-12.exp -+++ b/cts/scheduler/exp/ticket-group-12.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-group-13.exp b/cts/scheduler/exp/ticket-group-13.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-group-13.exp -+++ b/cts/scheduler/exp/ticket-group-13.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-group-14.exp b/cts/scheduler/exp/ticket-group-14.exp -index bbd4a0d341..c04bb2db75 100644 ---- a/cts/scheduler/exp/ticket-group-14.exp -+++ b/cts/scheduler/exp/ticket-group-14.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-15.exp b/cts/scheduler/exp/ticket-group-15.exp -index bbd4a0d341..c04bb2db75 100644 ---- a/cts/scheduler/exp/ticket-group-15.exp -+++ b/cts/scheduler/exp/ticket-group-15.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-16.exp b/cts/scheduler/exp/ticket-group-16.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-group-16.exp -+++ b/cts/scheduler/exp/ticket-group-16.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-group-17.exp b/cts/scheduler/exp/ticket-group-17.exp -index bbd4a0d341..c04bb2db75 100644 ---- a/cts/scheduler/exp/ticket-group-17.exp -+++ b/cts/scheduler/exp/ticket-group-17.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-18.exp b/cts/scheduler/exp/ticket-group-18.exp -index bbd4a0d341..c04bb2db75 100644 ---- a/cts/scheduler/exp/ticket-group-18.exp -+++ b/cts/scheduler/exp/ticket-group-18.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-19.exp b/cts/scheduler/exp/ticket-group-19.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-group-19.exp -+++ b/cts/scheduler/exp/ticket-group-19.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-group-2.exp b/cts/scheduler/exp/ticket-group-2.exp -index 5a7f812470..d958ce5b43 100644 ---- a/cts/scheduler/exp/ticket-group-2.exp -+++ b/cts/scheduler/exp/ticket-group-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-20.exp b/cts/scheduler/exp/ticket-group-20.exp -index bbd4a0d341..c04bb2db75 100644 ---- a/cts/scheduler/exp/ticket-group-20.exp -+++ b/cts/scheduler/exp/ticket-group-20.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-21.exp b/cts/scheduler/exp/ticket-group-21.exp -index 9597b5e94a..60dc50ec40 100644 ---- a/cts/scheduler/exp/ticket-group-21.exp -+++ b/cts/scheduler/exp/ticket-group-21.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-22.exp b/cts/scheduler/exp/ticket-group-22.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-group-22.exp -+++ b/cts/scheduler/exp/ticket-group-22.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-group-23.exp b/cts/scheduler/exp/ticket-group-23.exp -index bbd4a0d341..c04bb2db75 100644 ---- a/cts/scheduler/exp/ticket-group-23.exp -+++ b/cts/scheduler/exp/ticket-group-23.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-24.exp b/cts/scheduler/exp/ticket-group-24.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-group-24.exp -+++ b/cts/scheduler/exp/ticket-group-24.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-group-3.exp b/cts/scheduler/exp/ticket-group-3.exp -index bbd4a0d341..c04bb2db75 100644 ---- a/cts/scheduler/exp/ticket-group-3.exp -+++ b/cts/scheduler/exp/ticket-group-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-4.exp b/cts/scheduler/exp/ticket-group-4.exp -index de9e84b9ff..afe7015233 100644 ---- a/cts/scheduler/exp/ticket-group-4.exp -+++ b/cts/scheduler/exp/ticket-group-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-5.exp b/cts/scheduler/exp/ticket-group-5.exp -index 5a7f812470..d958ce5b43 100644 ---- a/cts/scheduler/exp/ticket-group-5.exp -+++ b/cts/scheduler/exp/ticket-group-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-6.exp b/cts/scheduler/exp/ticket-group-6.exp -index bbd4a0d341..c04bb2db75 100644 ---- a/cts/scheduler/exp/ticket-group-6.exp -+++ b/cts/scheduler/exp/ticket-group-6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-7.exp b/cts/scheduler/exp/ticket-group-7.exp -index de9e84b9ff..afe7015233 100644 ---- a/cts/scheduler/exp/ticket-group-7.exp -+++ b/cts/scheduler/exp/ticket-group-7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-8.exp b/cts/scheduler/exp/ticket-group-8.exp -index 5a7f812470..d958ce5b43 100644 ---- a/cts/scheduler/exp/ticket-group-8.exp -+++ b/cts/scheduler/exp/ticket-group-8.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-group-9.exp b/cts/scheduler/exp/ticket-group-9.exp -index 9597b5e94a..60dc50ec40 100644 ---- a/cts/scheduler/exp/ticket-group-9.exp -+++ b/cts/scheduler/exp/ticket-group-9.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-1.exp b/cts/scheduler/exp/ticket-primitive-1.exp -index 3abd19369a..ca7cd57be3 100644 ---- a/cts/scheduler/exp/ticket-primitive-1.exp -+++ b/cts/scheduler/exp/ticket-primitive-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-10.exp b/cts/scheduler/exp/ticket-primitive-10.exp -index 3abd19369a..ca7cd57be3 100644 ---- a/cts/scheduler/exp/ticket-primitive-10.exp -+++ b/cts/scheduler/exp/ticket-primitive-10.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-11.exp b/cts/scheduler/exp/ticket-primitive-11.exp -index 20cff93f51..aa77061152 100644 ---- a/cts/scheduler/exp/ticket-primitive-11.exp -+++ b/cts/scheduler/exp/ticket-primitive-11.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-12.exp b/cts/scheduler/exp/ticket-primitive-12.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-primitive-12.exp -+++ b/cts/scheduler/exp/ticket-primitive-12.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-primitive-13.exp b/cts/scheduler/exp/ticket-primitive-13.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-primitive-13.exp -+++ b/cts/scheduler/exp/ticket-primitive-13.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-primitive-14.exp b/cts/scheduler/exp/ticket-primitive-14.exp -index 525f8eb6d6..21009b95a9 100644 ---- a/cts/scheduler/exp/ticket-primitive-14.exp -+++ b/cts/scheduler/exp/ticket-primitive-14.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-15.exp b/cts/scheduler/exp/ticket-primitive-15.exp -index 525f8eb6d6..21009b95a9 100644 ---- a/cts/scheduler/exp/ticket-primitive-15.exp -+++ b/cts/scheduler/exp/ticket-primitive-15.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-16.exp b/cts/scheduler/exp/ticket-primitive-16.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-primitive-16.exp -+++ b/cts/scheduler/exp/ticket-primitive-16.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-primitive-17.exp b/cts/scheduler/exp/ticket-primitive-17.exp -index 525f8eb6d6..21009b95a9 100644 ---- a/cts/scheduler/exp/ticket-primitive-17.exp -+++ b/cts/scheduler/exp/ticket-primitive-17.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-18.exp b/cts/scheduler/exp/ticket-primitive-18.exp -index 525f8eb6d6..21009b95a9 100644 ---- a/cts/scheduler/exp/ticket-primitive-18.exp -+++ b/cts/scheduler/exp/ticket-primitive-18.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-19.exp b/cts/scheduler/exp/ticket-primitive-19.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-primitive-19.exp -+++ b/cts/scheduler/exp/ticket-primitive-19.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-primitive-2.exp b/cts/scheduler/exp/ticket-primitive-2.exp -index 20cff93f51..aa77061152 100644 ---- a/cts/scheduler/exp/ticket-primitive-2.exp -+++ b/cts/scheduler/exp/ticket-primitive-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-20.exp b/cts/scheduler/exp/ticket-primitive-20.exp -index 525f8eb6d6..21009b95a9 100644 ---- a/cts/scheduler/exp/ticket-primitive-20.exp -+++ b/cts/scheduler/exp/ticket-primitive-20.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-21.exp b/cts/scheduler/exp/ticket-primitive-21.exp -index 14b86321a6..b523e4b7c5 100644 ---- a/cts/scheduler/exp/ticket-primitive-21.exp -+++ b/cts/scheduler/exp/ticket-primitive-21.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-22.exp b/cts/scheduler/exp/ticket-primitive-22.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-primitive-22.exp -+++ b/cts/scheduler/exp/ticket-primitive-22.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-primitive-23.exp b/cts/scheduler/exp/ticket-primitive-23.exp -index 525f8eb6d6..21009b95a9 100644 ---- a/cts/scheduler/exp/ticket-primitive-23.exp -+++ b/cts/scheduler/exp/ticket-primitive-23.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-24.exp b/cts/scheduler/exp/ticket-primitive-24.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-primitive-24.exp -+++ b/cts/scheduler/exp/ticket-primitive-24.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-primitive-3.exp b/cts/scheduler/exp/ticket-primitive-3.exp -index 525f8eb6d6..21009b95a9 100644 ---- a/cts/scheduler/exp/ticket-primitive-3.exp -+++ b/cts/scheduler/exp/ticket-primitive-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-4.exp b/cts/scheduler/exp/ticket-primitive-4.exp -index 3abd19369a..ca7cd57be3 100644 ---- a/cts/scheduler/exp/ticket-primitive-4.exp -+++ b/cts/scheduler/exp/ticket-primitive-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-5.exp b/cts/scheduler/exp/ticket-primitive-5.exp -index 20cff93f51..aa77061152 100644 ---- a/cts/scheduler/exp/ticket-primitive-5.exp -+++ b/cts/scheduler/exp/ticket-primitive-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-6.exp b/cts/scheduler/exp/ticket-primitive-6.exp -index 525f8eb6d6..21009b95a9 100644 ---- a/cts/scheduler/exp/ticket-primitive-6.exp -+++ b/cts/scheduler/exp/ticket-primitive-6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-7.exp b/cts/scheduler/exp/ticket-primitive-7.exp -index 3abd19369a..ca7cd57be3 100644 ---- a/cts/scheduler/exp/ticket-primitive-7.exp -+++ b/cts/scheduler/exp/ticket-primitive-7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-8.exp b/cts/scheduler/exp/ticket-primitive-8.exp -index 20cff93f51..aa77061152 100644 ---- a/cts/scheduler/exp/ticket-primitive-8.exp -+++ b/cts/scheduler/exp/ticket-primitive-8.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-primitive-9.exp b/cts/scheduler/exp/ticket-primitive-9.exp -index 14b86321a6..b523e4b7c5 100644 ---- a/cts/scheduler/exp/ticket-primitive-9.exp -+++ b/cts/scheduler/exp/ticket-primitive-9.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-1.exp b/cts/scheduler/exp/ticket-promoted-1.exp -index d6d8a3605e..7690786e64 100644 ---- a/cts/scheduler/exp/ticket-promoted-1.exp -+++ b/cts/scheduler/exp/ticket-promoted-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-10.exp b/cts/scheduler/exp/ticket-promoted-10.exp -index 46ce1904ac..5831f42acd 100644 ---- a/cts/scheduler/exp/ticket-promoted-10.exp -+++ b/cts/scheduler/exp/ticket-promoted-10.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-11.exp b/cts/scheduler/exp/ticket-promoted-11.exp -index 516fe7a563..28c656b2fb 100644 ---- a/cts/scheduler/exp/ticket-promoted-11.exp -+++ b/cts/scheduler/exp/ticket-promoted-11.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-12.exp b/cts/scheduler/exp/ticket-promoted-12.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-promoted-12.exp -+++ b/cts/scheduler/exp/ticket-promoted-12.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-promoted-13.exp b/cts/scheduler/exp/ticket-promoted-13.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-promoted-13.exp -+++ b/cts/scheduler/exp/ticket-promoted-13.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-promoted-14.exp b/cts/scheduler/exp/ticket-promoted-14.exp -index 3adfeb1b8f..0cf7d31d14 100644 ---- a/cts/scheduler/exp/ticket-promoted-14.exp -+++ b/cts/scheduler/exp/ticket-promoted-14.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-15.exp b/cts/scheduler/exp/ticket-promoted-15.exp -index 3adfeb1b8f..0cf7d31d14 100644 ---- a/cts/scheduler/exp/ticket-promoted-15.exp -+++ b/cts/scheduler/exp/ticket-promoted-15.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-16.exp b/cts/scheduler/exp/ticket-promoted-16.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-promoted-16.exp -+++ b/cts/scheduler/exp/ticket-promoted-16.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-promoted-17.exp b/cts/scheduler/exp/ticket-promoted-17.exp -index 0992ebca90..cbdf478ad3 100644 ---- a/cts/scheduler/exp/ticket-promoted-17.exp -+++ b/cts/scheduler/exp/ticket-promoted-17.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-18.exp b/cts/scheduler/exp/ticket-promoted-18.exp -index 0992ebca90..cbdf478ad3 100644 ---- a/cts/scheduler/exp/ticket-promoted-18.exp -+++ b/cts/scheduler/exp/ticket-promoted-18.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-19.exp b/cts/scheduler/exp/ticket-promoted-19.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-promoted-19.exp -+++ b/cts/scheduler/exp/ticket-promoted-19.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-promoted-2.exp b/cts/scheduler/exp/ticket-promoted-2.exp -index 7f1a8d3c5a..95246397ab 100644 ---- a/cts/scheduler/exp/ticket-promoted-2.exp -+++ b/cts/scheduler/exp/ticket-promoted-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-20.exp b/cts/scheduler/exp/ticket-promoted-20.exp -index 0992ebca90..cbdf478ad3 100644 ---- a/cts/scheduler/exp/ticket-promoted-20.exp -+++ b/cts/scheduler/exp/ticket-promoted-20.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-21.exp b/cts/scheduler/exp/ticket-promoted-21.exp -index 47ed9ef499..943faeea51 100644 ---- a/cts/scheduler/exp/ticket-promoted-21.exp -+++ b/cts/scheduler/exp/ticket-promoted-21.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-22.exp b/cts/scheduler/exp/ticket-promoted-22.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-promoted-22.exp -+++ b/cts/scheduler/exp/ticket-promoted-22.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-promoted-23.exp b/cts/scheduler/exp/ticket-promoted-23.exp -index 0992ebca90..cbdf478ad3 100644 ---- a/cts/scheduler/exp/ticket-promoted-23.exp -+++ b/cts/scheduler/exp/ticket-promoted-23.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-24.exp b/cts/scheduler/exp/ticket-promoted-24.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-promoted-24.exp -+++ b/cts/scheduler/exp/ticket-promoted-24.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-promoted-3.exp b/cts/scheduler/exp/ticket-promoted-3.exp -index 3adfeb1b8f..0cf7d31d14 100644 ---- a/cts/scheduler/exp/ticket-promoted-3.exp -+++ b/cts/scheduler/exp/ticket-promoted-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-4.exp b/cts/scheduler/exp/ticket-promoted-4.exp -index 46ce1904ac..5831f42acd 100644 ---- a/cts/scheduler/exp/ticket-promoted-4.exp -+++ b/cts/scheduler/exp/ticket-promoted-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-5.exp b/cts/scheduler/exp/ticket-promoted-5.exp -index 516fe7a563..28c656b2fb 100644 ---- a/cts/scheduler/exp/ticket-promoted-5.exp -+++ b/cts/scheduler/exp/ticket-promoted-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-6.exp b/cts/scheduler/exp/ticket-promoted-6.exp -index 0992ebca90..cbdf478ad3 100644 ---- a/cts/scheduler/exp/ticket-promoted-6.exp -+++ b/cts/scheduler/exp/ticket-promoted-6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-7.exp b/cts/scheduler/exp/ticket-promoted-7.exp -index 46ce1904ac..5831f42acd 100644 ---- a/cts/scheduler/exp/ticket-promoted-7.exp -+++ b/cts/scheduler/exp/ticket-promoted-7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-8.exp b/cts/scheduler/exp/ticket-promoted-8.exp -index 516fe7a563..28c656b2fb 100644 ---- a/cts/scheduler/exp/ticket-promoted-8.exp -+++ b/cts/scheduler/exp/ticket-promoted-8.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-promoted-9.exp b/cts/scheduler/exp/ticket-promoted-9.exp -index 47ed9ef499..943faeea51 100644 ---- a/cts/scheduler/exp/ticket-promoted-9.exp -+++ b/cts/scheduler/exp/ticket-promoted-9.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-rsc-sets-1.exp b/cts/scheduler/exp/ticket-rsc-sets-1.exp -index 07d173465d..ff8d1777cf 100644 ---- a/cts/scheduler/exp/ticket-rsc-sets-1.exp -+++ b/cts/scheduler/exp/ticket-rsc-sets-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-rsc-sets-10.exp b/cts/scheduler/exp/ticket-rsc-sets-10.exp -index 1a9c30f505..f8ba6090c1 100644 ---- a/cts/scheduler/exp/ticket-rsc-sets-10.exp -+++ b/cts/scheduler/exp/ticket-rsc-sets-10.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-rsc-sets-11.exp b/cts/scheduler/exp/ticket-rsc-sets-11.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-rsc-sets-11.exp -+++ b/cts/scheduler/exp/ticket-rsc-sets-11.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-rsc-sets-12.exp b/cts/scheduler/exp/ticket-rsc-sets-12.exp -index d7c4a3f081..806f468e71 100644 ---- a/cts/scheduler/exp/ticket-rsc-sets-12.exp -+++ b/cts/scheduler/exp/ticket-rsc-sets-12.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-rsc-sets-13.exp b/cts/scheduler/exp/ticket-rsc-sets-13.exp -index 1a9c30f505..f8ba6090c1 100644 ---- a/cts/scheduler/exp/ticket-rsc-sets-13.exp -+++ b/cts/scheduler/exp/ticket-rsc-sets-13.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-rsc-sets-14.exp b/cts/scheduler/exp/ticket-rsc-sets-14.exp -index 1a9c30f505..f8ba6090c1 100644 ---- a/cts/scheduler/exp/ticket-rsc-sets-14.exp -+++ b/cts/scheduler/exp/ticket-rsc-sets-14.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-rsc-sets-2.exp b/cts/scheduler/exp/ticket-rsc-sets-2.exp -index 277515408a..8d9c7c7319 100644 ---- a/cts/scheduler/exp/ticket-rsc-sets-2.exp -+++ b/cts/scheduler/exp/ticket-rsc-sets-2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-rsc-sets-3.exp b/cts/scheduler/exp/ticket-rsc-sets-3.exp -index 1a9c30f505..f8ba6090c1 100644 ---- a/cts/scheduler/exp/ticket-rsc-sets-3.exp -+++ b/cts/scheduler/exp/ticket-rsc-sets-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-rsc-sets-4.exp b/cts/scheduler/exp/ticket-rsc-sets-4.exp -index 07d173465d..ff8d1777cf 100644 ---- a/cts/scheduler/exp/ticket-rsc-sets-4.exp -+++ b/cts/scheduler/exp/ticket-rsc-sets-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-rsc-sets-5.exp b/cts/scheduler/exp/ticket-rsc-sets-5.exp -index 6c4140db28..c2b4cfa14c 100644 ---- a/cts/scheduler/exp/ticket-rsc-sets-5.exp -+++ b/cts/scheduler/exp/ticket-rsc-sets-5.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-rsc-sets-6.exp b/cts/scheduler/exp/ticket-rsc-sets-6.exp -index 493c514af6..7a0dec5658 100644 ---- a/cts/scheduler/exp/ticket-rsc-sets-6.exp -+++ b/cts/scheduler/exp/ticket-rsc-sets-6.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-rsc-sets-7.exp b/cts/scheduler/exp/ticket-rsc-sets-7.exp -index 1a9c30f505..f8ba6090c1 100644 ---- a/cts/scheduler/exp/ticket-rsc-sets-7.exp -+++ b/cts/scheduler/exp/ticket-rsc-sets-7.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/ticket-rsc-sets-8.exp b/cts/scheduler/exp/ticket-rsc-sets-8.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/ticket-rsc-sets-8.exp -+++ b/cts/scheduler/exp/ticket-rsc-sets-8.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/ticket-rsc-sets-9.exp b/cts/scheduler/exp/ticket-rsc-sets-9.exp -index 1a9c30f505..f8ba6090c1 100644 ---- a/cts/scheduler/exp/ticket-rsc-sets-9.exp -+++ b/cts/scheduler/exp/ticket-rsc-sets-9.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/timeout-by-node.exp b/cts/scheduler/exp/timeout-by-node.exp -index 19d1afcca7..c93744e04d 100644 ---- a/cts/scheduler/exp/timeout-by-node.exp -+++ b/cts/scheduler/exp/timeout-by-node.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/unfence-definition.exp b/cts/scheduler/exp/unfence-definition.exp -index 308f638b77..a531cca82c 100644 ---- a/cts/scheduler/exp/unfence-definition.exp -+++ b/cts/scheduler/exp/unfence-definition.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/unfence-device.exp b/cts/scheduler/exp/unfence-device.exp -index 452351d986..3839818a71 100644 ---- a/cts/scheduler/exp/unfence-device.exp -+++ b/cts/scheduler/exp/unfence-device.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/unfence-parameters.exp b/cts/scheduler/exp/unfence-parameters.exp -index 0b76e26eb7..055af8625a 100644 ---- a/cts/scheduler/exp/unfence-parameters.exp -+++ b/cts/scheduler/exp/unfence-parameters.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/unfence-startup.exp b/cts/scheduler/exp/unfence-startup.exp -index f2d38e80ca..cfdad5273b 100644 ---- a/cts/scheduler/exp/unfence-startup.exp -+++ b/cts/scheduler/exp/unfence-startup.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/unmanaged-block-restart.exp b/cts/scheduler/exp/unmanaged-block-restart.exp -index c23188803c..fc1740c2d1 100644 ---- a/cts/scheduler/exp/unmanaged-block-restart.exp -+++ b/cts/scheduler/exp/unmanaged-block-restart.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/unmanaged-promoted.exp b/cts/scheduler/exp/unmanaged-promoted.exp -index eada1f642e..4d3d886578 100644 ---- a/cts/scheduler/exp/unmanaged-promoted.exp -+++ b/cts/scheduler/exp/unmanaged-promoted.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/unmanaged-stop-1.exp b/cts/scheduler/exp/unmanaged-stop-1.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/unmanaged-stop-1.exp -+++ b/cts/scheduler/exp/unmanaged-stop-1.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/unmanaged-stop-2.exp b/cts/scheduler/exp/unmanaged-stop-2.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/unmanaged-stop-2.exp -+++ b/cts/scheduler/exp/unmanaged-stop-2.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/unmanaged-stop-3.exp b/cts/scheduler/exp/unmanaged-stop-3.exp -index 9b43d75dd1..2e33003361 100644 ---- a/cts/scheduler/exp/unmanaged-stop-3.exp -+++ b/cts/scheduler/exp/unmanaged-stop-3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/unmanaged-stop-4.exp b/cts/scheduler/exp/unmanaged-stop-4.exp -index 9b43d75dd1..2e33003361 100644 ---- a/cts/scheduler/exp/unmanaged-stop-4.exp -+++ b/cts/scheduler/exp/unmanaged-stop-4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/unrunnable-1.exp b/cts/scheduler/exp/unrunnable-1.exp -index 8a3a7d7f3d..c71f41a50f 100644 ---- a/cts/scheduler/exp/unrunnable-1.exp -+++ b/cts/scheduler/exp/unrunnable-1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/unrunnable-2.exp b/cts/scheduler/exp/unrunnable-2.exp -index 56e315ff01..3303b35e42 100644 ---- a/cts/scheduler/exp/unrunnable-2.exp -+++ b/cts/scheduler/exp/unrunnable-2.exp -@@ -1 +1 @@ -- -+ -diff --git a/cts/scheduler/exp/use-after-free-merge.exp b/cts/scheduler/exp/use-after-free-merge.exp -index 33d478bccd..9efd55474d 100644 ---- a/cts/scheduler/exp/use-after-free-merge.exp -+++ b/cts/scheduler/exp/use-after-free-merge.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/utilization-check-allowed-nodes.exp b/cts/scheduler/exp/utilization-check-allowed-nodes.exp -index 66b7b388c3..f80074fa85 100644 ---- a/cts/scheduler/exp/utilization-check-allowed-nodes.exp -+++ b/cts/scheduler/exp/utilization-check-allowed-nodes.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/utilization-complex.exp b/cts/scheduler/exp/utilization-complex.exp -index e7a0a07990..d3277b1bbb 100644 ---- a/cts/scheduler/exp/utilization-complex.exp -+++ b/cts/scheduler/exp/utilization-complex.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/utilization-order1.exp b/cts/scheduler/exp/utilization-order1.exp -index 2d9998ced0..1cc02d7eb1 100644 ---- a/cts/scheduler/exp/utilization-order1.exp -+++ b/cts/scheduler/exp/utilization-order1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/utilization-order2.exp b/cts/scheduler/exp/utilization-order2.exp -index bd87940e41..c74c7d22eb 100644 ---- a/cts/scheduler/exp/utilization-order2.exp -+++ b/cts/scheduler/exp/utilization-order2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/utilization-order3.exp b/cts/scheduler/exp/utilization-order3.exp -index 67a9f21add..74c6f35bc4 100644 ---- a/cts/scheduler/exp/utilization-order3.exp -+++ b/cts/scheduler/exp/utilization-order3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/utilization-order4.exp b/cts/scheduler/exp/utilization-order4.exp -index 996eb1bb90..3ec5212192 100644 ---- a/cts/scheduler/exp/utilization-order4.exp -+++ b/cts/scheduler/exp/utilization-order4.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/utilization-shuffle.exp b/cts/scheduler/exp/utilization-shuffle.exp -index 82653e2f8d..91b1090ae0 100644 ---- a/cts/scheduler/exp/utilization-shuffle.exp -+++ b/cts/scheduler/exp/utilization-shuffle.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/utilization.exp b/cts/scheduler/exp/utilization.exp -index a37125735e..5eec2bf800 100644 ---- a/cts/scheduler/exp/utilization.exp -+++ b/cts/scheduler/exp/utilization.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/value-source.exp b/cts/scheduler/exp/value-source.exp -index 4bf469fda8..f20602ef29 100644 ---- a/cts/scheduler/exp/value-source.exp -+++ b/cts/scheduler/exp/value-source.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/whitebox-asymmetric.exp b/cts/scheduler/exp/whitebox-asymmetric.exp -index 6db621da3a..e58cdc0910 100644 ---- a/cts/scheduler/exp/whitebox-asymmetric.exp -+++ b/cts/scheduler/exp/whitebox-asymmetric.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/whitebox-fail1.exp b/cts/scheduler/exp/whitebox-fail1.exp -index e5db07b0e9..04db2b6819 100644 ---- a/cts/scheduler/exp/whitebox-fail1.exp -+++ b/cts/scheduler/exp/whitebox-fail1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/whitebox-fail2.exp b/cts/scheduler/exp/whitebox-fail2.exp -index e5db07b0e9..04db2b6819 100644 ---- a/cts/scheduler/exp/whitebox-fail2.exp -+++ b/cts/scheduler/exp/whitebox-fail2.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/whitebox-fail3.exp b/cts/scheduler/exp/whitebox-fail3.exp -index 41d815bf3a..947e001985 100644 ---- a/cts/scheduler/exp/whitebox-fail3.exp -+++ b/cts/scheduler/exp/whitebox-fail3.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/whitebox-imply-stop-on-fence.exp b/cts/scheduler/exp/whitebox-imply-stop-on-fence.exp -index 3b2476852c..a1a200ecd8 100644 ---- a/cts/scheduler/exp/whitebox-imply-stop-on-fence.exp -+++ b/cts/scheduler/exp/whitebox-imply-stop-on-fence.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/whitebox-migrate1.exp b/cts/scheduler/exp/whitebox-migrate1.exp -index 48c255024e..49ca28414b 100644 ---- a/cts/scheduler/exp/whitebox-migrate1.exp -+++ b/cts/scheduler/exp/whitebox-migrate1.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/whitebox-move.exp b/cts/scheduler/exp/whitebox-move.exp -index 3f072539a7..7b0281b173 100644 ---- a/cts/scheduler/exp/whitebox-move.exp -+++ b/cts/scheduler/exp/whitebox-move.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/whitebox-ms-ordering-move.exp b/cts/scheduler/exp/whitebox-ms-ordering-move.exp -index 482af3df4c..ab7ab4f95f 100644 ---- a/cts/scheduler/exp/whitebox-ms-ordering-move.exp -+++ b/cts/scheduler/exp/whitebox-ms-ordering-move.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/whitebox-ms-ordering.exp b/cts/scheduler/exp/whitebox-ms-ordering.exp -index f88c4eb1c4..56079567e7 100644 ---- a/cts/scheduler/exp/whitebox-ms-ordering.exp -+++ b/cts/scheduler/exp/whitebox-ms-ordering.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/whitebox-nested-group.exp b/cts/scheduler/exp/whitebox-nested-group.exp -index eb38f6b03c..52d71a2e6b 100644 ---- a/cts/scheduler/exp/whitebox-nested-group.exp -+++ b/cts/scheduler/exp/whitebox-nested-group.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/whitebox-orphan-ms.exp b/cts/scheduler/exp/whitebox-orphan-ms.exp -index 8690d7b45f..898320bf0f 100644 ---- a/cts/scheduler/exp/whitebox-orphan-ms.exp -+++ b/cts/scheduler/exp/whitebox-orphan-ms.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/whitebox-orphaned.exp b/cts/scheduler/exp/whitebox-orphaned.exp -index ee7132a476..a8c700f8c7 100644 ---- a/cts/scheduler/exp/whitebox-orphaned.exp -+++ b/cts/scheduler/exp/whitebox-orphaned.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/whitebox-start.exp b/cts/scheduler/exp/whitebox-start.exp -index 95250d6196..83990648c7 100644 ---- a/cts/scheduler/exp/whitebox-start.exp -+++ b/cts/scheduler/exp/whitebox-start.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/whitebox-stop.exp b/cts/scheduler/exp/whitebox-stop.exp -index f4cd3950f8..b984831847 100644 ---- a/cts/scheduler/exp/whitebox-stop.exp -+++ b/cts/scheduler/exp/whitebox-stop.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/whitebox-unexpectedly-running.exp b/cts/scheduler/exp/whitebox-unexpectedly-running.exp -index f6a961c7bd..7f810f8e12 100644 ---- a/cts/scheduler/exp/whitebox-unexpectedly-running.exp -+++ b/cts/scheduler/exp/whitebox-unexpectedly-running.exp -@@ -1,4 +1,4 @@ -- -+ - - - -diff --git a/cts/scheduler/exp/year-2038.exp b/cts/scheduler/exp/year-2038.exp -index 7fe49b2739..5b1ce5b947 100644 ---- a/cts/scheduler/exp/year-2038.exp -+++ b/cts/scheduler/exp/year-2038.exp -@@ -1,4 +1,4 @@ -- -+ - - - --- -2.33.1.windows.1 - diff --git a/pacemaker-3980678f0.tar.gz b/pacemaker-49aab9983.tar.gz similarity index 45% rename from pacemaker-3980678f0.tar.gz rename to pacemaker-49aab9983.tar.gz index b12205c71bb5c2a6a901b5f8073eb43b7ead1d79..cccebf3ad0f63d2d6c364ebfe8986bb655a63e0d 100644 Binary files a/pacemaker-3980678f0.tar.gz and b/pacemaker-49aab9983.tar.gz differ diff --git a/pacemaker.spec b/pacemaker.spec index 25e12f51b5d407967bd62c9005badaae14ac44d9..caad299d8b0794f2be9f4bc29a3d6a5d1c0d608e 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -16,11 +16,11 @@ ## Upstream pacemaker version, and its package version (specversion ## can be incremented to build packages reliably considered "newer" ## than previously built packages with the same pcmkversion) -%global pcmkversion 2.1.8 -%global specversion 9 +%global pcmkversion 2.1.9 +%global specversion 1 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build -%global commit 3980678f0372f2c7c294c01f61d63f0b2cafaad1 +%global commit 49aab998399b9fec21631ff610ae5bdcc4ffb7a4 ## Since git v2.11, the extent of abbreviation is autoscaled by default ## (used to be constant of 7), so we need to convey it for non-tags, too. @@ -149,29 +149,6 @@ Url: https://www.clusterlabs.org/ # You can use "spectool -s 0 pacemaker.spec" (rpmdevtools) to show final URL. Source0: https://codeload.github.com/%{github_owner}/%{name}/tar.gz/%{archive_github_url} Source1: https://codeload.github.com/%{github_owner}/%{nagios_name}/tar.gz/%{nagios_archive_github_url} -Patch0: backport-Build-rpm-require-rpm-4.14.0-or-later.patch -# https://github.com/ClusterLabs/pacemaker/commit/f66e08174fff4552ba3914f12e56517a2d5663e1 -Patch1: backport-Low-schemas-Add-additional-node-types-to-the-crmadmi.patch -# https://github.com/ClusterLabs/pacemaker/commit/2169d226538a75cdc1a8107bcd86499b21303fd7 -Patch2: backport-Feature-python-Add-a-python-wrapper-for-crm_exit_str.patch -# https://github.com/ClusterLabs/pacemaker/commit/8dbd0816c84b075b02e21f733376343ec60290a6 -Patch3: backport-Low-controller-libpacemaker-transition-graph-IDs-sho.patch -Patch4: backport-Test-cts-scheduler-update-expected-graph-outputs-for.patch -Patch5: backport-Refactor-libpacemaker-de-inline-pcmk__colocation_has.patch -Patch6: backport-Log-various-ensure-there-are-spaces-around-CRM_XS.patch -Patch7: backport-Log-pacemaker-based-client-name-can-be-NULL.patch -Patch8: backport-Refactor-libcib-drop-op_common.patch -Patch9: backport-Refactor-libcrmcommon-Add-pcmk__tls_client_try_hands.patch -Patch10: backport-Low-tools-handle-orphans-when-outputting-node-histor.patch -Patch11: backport-Refactor-lrmd-Move-TLS-connection-success-failure-in.patch -Patch12: backport-Low-lrmd-Report-connection-failures-in-tls_handshake.patch -Patch13: backport-Feature-lrmd-Perform-the-TLS-handshake-asynchronousl.patch -Patch14: backport-API-libcrmcommon-add-pcmk_cib_node_shutdown.patch -Patch15: backport-Fix-libcrmcommon-Detect-newly-created-alerts-section.patch -Patch16: backport-Refactor-fencer-rename-variables-for-terminology-cha.patch -Patch17: backport-Log-fencer-update-terminology-in-trace-message.patch -Patch18: backport-API-libcrmcommon-deprecate-PCMK_VALUE_FENCE_LEGACY-d.patch -Patch19: backport-Low-libcib-improve-error-handling-in-cib_file_new.patch Requires: resource-agents Requires: %{pkgname_pcmk_libs} = %{version}-%{release} @@ -779,6 +756,12 @@ exit 0 %license %{nagios_name}-%{nagios_hash}/COPYING %changelog +* Tue Aug 26 2025 zouzhimin - 2.1.9-1 +- Update to version 2.1.9 +- Fix regression in adding alerts to CIB +- Fix a crash in command line tools when stderr is closed +- build: support building with libxml2 2.13.0 or newer + * Tue Dec 24 2024 liupei - 2.1.8-9 - Refactor: fencer: rename variables for terminology change - Log: fencer: update terminology in trace message