From 36a7448a5766e90751f4bf96a1364ad211b3ba06 Mon Sep 17 00:00:00 2001 From: Larry Ivange Date: Mon, 8 Jul 2024 20:25:34 -0500 Subject: [PATCH] Fix rebase error --- .../en/docs/tasks/manage/setup_wait_for_pods_ready.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/site/content/en/docs/tasks/manage/setup_wait_for_pods_ready.md b/site/content/en/docs/tasks/manage/setup_wait_for_pods_ready.md index 298c7aee24..3d20527ca6 100644 --- a/site/content/en/docs/tasks/manage/setup_wait_for_pods_ready.md +++ b/site/content/en/docs/tasks/manage/setup_wait_for_pods_ready.md @@ -74,12 +74,8 @@ When enabled, then the workloads are admitted sequentially to prevent deadlock situations as demonstrated in the example below. ### Requeuing Strategy -<<<<<<< HEAD:site/content/en/docs/tasks/manage/setup_wait_for_pods_ready.md -{{< feature-state state="stable" for_version="v0.6.0+" >}} -======= -{{< feature-state state="stable" for_version="v0.6.0" >}} ->>>>>>> 1dcff82e (Use feature-state states):site/content/en/docs/tasks/manage/setup_sequential_admission.md +{{< feature-state state="stable" for_version="v0.6" >}} {{% alert title="Note" color="primary" %}} The `backoffBaseSeconds` and `backoffMaxSeconds` are available in Kueue v0.7.0 and later