Skip to content

🤖 Merge 8.4.x-sync into master#6614

Merged
MetRonnie merged 3 commits intomasterfrom
8.4.x-sync
Feb 18, 2025
Merged

🤖 Merge 8.4.x-sync into master#6614
MetRonnie merged 3 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

* scan: refresh NFS cache for contact file
* load_contact_file: refresh NFS cache for directories above contact file
* infer_latest_run: refresh NFS cache for the run directory
@github-actions github-actions bot added the sync PR for synchronising changes between 8.*.x and master label Feb 18, 2025
Get poll to return task failure if job/log has been removed.

---------

Co-authored-by: Oliver Sanders <oliver.sanders@metoffice.gov.uk>
Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
@oliver-sanders oliver-sanders requested a review from wxtim February 18, 2025 11:36
@oliver-sanders
Copy link
Copy Markdown
Member

@wxtim, could you take a look at this one, small conflict with the polling change.

@wxtim wxtim force-pushed the 8.4.x-sync branch 3 times, most recently from 8744c10 to 21d18ba Compare February 18, 2025 14:54
@oliver-sanders oliver-sanders requested a review from wxtim February 18, 2025 15:00
@MetRonnie MetRonnie self-assigned this Feb 18, 2025
@MetRonnie MetRonnie merged commit 79000ee into master Feb 18, 2025
27 checks passed
@MetRonnie MetRonnie deleted the 8.4.x-sync branch February 18, 2025 17:44
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