From 8d6b451d86e8e9f14a5b9c0a8c8bc3dcd96d7578 Mon Sep 17 00:00:00 2001 From: Tom Nabarro Date: Fri, 1 Nov 2024 19:38:34 +0000 Subject: [PATCH] fix changelog merge issue Test-tag: pr daily_regression hw,medium,ListVerboseTest Skip-func-hw-test-medium-md-on-ssd: false Skip-func-hw-test-large-md-on-ssd: false Allow-unstable-test: true Required-githooks: true Signed-off-by: Tom Nabarro --- debian/changelog | 3 ++- src/tests/ftest/util/agent_utils.py | 1 + src/tests/ftest/util/cart_ctl_utils.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7c33b6fbc6f..a77e2e130b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -137,12 +137,13 @@ daos (2.5.100-12) unstable; urgency=medium -- Tomasz Gromadzki Fri, 17 Nov 2023 12:52:00 -0400 +daos (2.5.100-11) unstable; urgency=medium [ Jerome Soumagne ] * Bump mercury min version to 2.3.1 -- Jerome Soumagne Wed, 15 Nov 2023 10:30:00 -0600 -daos (2.5.100-11) unstable; urgency=medium +daos (2.5.100-10) unstable; urgency=medium [ Phillip Henderson ] * Move verify_perms.py location diff --git a/src/tests/ftest/util/agent_utils.py b/src/tests/ftest/util/agent_utils.py index 954ca0c407f..74b79fb9796 100644 --- a/src/tests/ftest/util/agent_utils.py +++ b/src/tests/ftest/util/agent_utils.py @@ -314,6 +314,7 @@ def support_collect_log(self, **kwargs): Returns: CommandResult: groups of command results from the same hosts with the same return status + """ cmd = self.manager.job.copy() cmd.debug.value = False diff --git a/src/tests/ftest/util/cart_ctl_utils.py b/src/tests/ftest/util/cart_ctl_utils.py index 7f96542374b..762dcf2359d 100644 --- a/src/tests/ftest/util/cart_ctl_utils.py +++ b/src/tests/ftest/util/cart_ctl_utils.py @@ -1,5 +1,5 @@ """ - (C) Copyright 2019-2024 Intel Corporation. + (C) Copyright 2019-2023 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent """