Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🤖 Merge 8.2.x-sync into master #5957

Merged
merged 2 commits into from
Feb 8, 2024
Merged

🤖 Merge 8.2.x-sync into master #5957

merged 2 commits into from
Feb 8, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Feb 5, 2024

Please do a normal merge, not squash merge.
Please fix conflicts if necessary.


Triggered by push

Don't record satisfied xtriggers in the DB

* Closes #5911
* Test that no wall_clock xtriggers are saved to the DB for a retry.

---------

Co-authored-by: Ronnie Dutta <[email protected]>
Co-authored-by: Oliver Sanders <[email protected]>
@github-actions github-actions bot added the sync PR for synchronising changes between 8.*.x and master label Feb 5, 2024
@wxtim wxtim requested a review from oliver-sanders February 6, 2024 16:23
@oliver-sanders oliver-sanders requested review from wxtim and removed request for oliver-sanders February 6, 2024 16:56
Copy link
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.

I've force-pushed to squash those two "update conftest" commits seeing as we can't squash-merge this

@wxtim wxtim merged commit b1b189b into master Feb 8, 2024
27 checks passed
@wxtim wxtim deleted the 8.2.x-sync branch February 8, 2024 10:15
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.

2 participants