Skip to content

Merge vNext commits into main#456

Merged
leochr merged 6 commits intomainfrom
vNext
Sep 20, 2023
Merged

Merge vNext commits into main#456
leochr merged 6 commits intomainfrom
vNext

Conversation

@leochr
Copy link
Copy Markdown
Member

@leochr leochr commented Sep 20, 2023

I unintentionally squashed and merged the commits from the previous PR #454, hence the same commits from vNext are still listed as differences between the 2 branches. So opening this PR to merge commits as is.

wraschke and others added 6 commits September 5, 2023 11:48
Some environments cause higher PIDs to be used in
the container than 100 which leads to potential
conflicts in the PID needed to restore.

This change increases the checkpoint PID to be > 1000.
More investigation is needed to do this efficiently.
If a more efficient way is found then we may want to
increase this to a higher PID value.  To avoid long
delays during a checkpoint the value of 1000 is being
used for now.
Bump PID used for checkpoint to be > 1000
@leochr leochr requested a review from mbroz2 September 20, 2023 13:56
@mbroz2
Copy link
Copy Markdown
Member

mbroz2 commented Sep 20, 2023

It's always annoying how GH presents the resulting diff when that happens, as it can be confusing.
And it's a shame they don't provide the ability to set merge options at the branch level, only at the repo level.

@leochr leochr merged commit d02a4a9 into main Sep 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants