Update develop with v1.36.1 (and resolve conflict) #2816
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…d-param Hot fix to add defaults to cloud params
harshthakkar01
approved these changes
Jul 29, 2024
nick-stroud
merged commit 83ab6b7
into
GoogleCloudPlatform:develop
11 of 55 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The change in the patch hotfix was resolved in a slightly different way on develop. See #2810.
On develop the defaults were coded into the Slurm GCP scripts. Because the scripts have moved location the fix on develop was not appropriate for the patch to main. When resolving conflicts in this PR the changes from develop were favored.
Submission Checklist
Please take the following actions before submitting this pull request.