Skip to content

🤖 Merge 8.4.x-sync into master#6796

Merged
MetRonnie merged 6 commits intomasterfrom
8.4.x-sync
Jun 18, 2025
Merged

🤖 Merge 8.4.x-sync into master#6796
MetRonnie merged 6 commits intomasterfrom
8.4.x-sync

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

Important

Please do a normal merge, not squash merge.

Please fix conflicts if necessary.


Triggered by push

@github-actions github-actions bot added the sync PR for synchronising changes between 8.*.x and master label Jun 17, 2025
oliver-sanders and others added 2 commits June 17, 2025 16:36
* Closes #6797
* Fixes an issue where multiple tasks being submitted in the same batch
  could interact via the "bad hosts" set.
* This would result in one task entering an infinite submission retry
  loop despite this not having been configured.
Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
@MetRonnie MetRonnie marked this pull request as draft June 17, 2025 16:54
@MetRonnie MetRonnie self-assigned this Jun 17, 2025
@oliver-sanders oliver-sanders marked this pull request as ready for review June 18, 2025 11:11
Copy link
Copy Markdown
Member

@oliver-sanders oliver-sanders left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Manually tested the infinite submission fix.

@MetRonnie MetRonnie marked this pull request as draft June 18, 2025 11:13
@MetRonnie MetRonnie marked this pull request as ready for review June 18, 2025 11:17
Copy link
Copy Markdown
Member

@MetRonnie MetRonnie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is ok (but #6800 was already open!)

@MetRonnie MetRonnie merged commit 00ee9ee into master Jun 18, 2025
30 checks passed
@MetRonnie MetRonnie deleted the 8.4.x-sync branch June 18, 2025 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

sync PR for synchronising changes between 8.*.x and master

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants