Merge releases/v3 into releases/v2 #2446
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Mergeback v3.26.4 refs/heads/releases/v3 into main
Co-authored-by: Henry Mercer <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Update changelog and version after v3.26.4 * Update checked-in dependencies * Only run check SIP enablement once in `init` step (#2441) Co-authored-by: Henry Mercer <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update changelog for v3.26.5 --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Angela P Wen <[email protected]> Co-authored-by: Henry Mercer <[email protected]>
This reverts commit 1de3044.
This reverts commit 4799b0f.
github-actions
bot
added
the
Update dependencies
angelapwen
added
Update dependencies
github-actions
bot
removed
the
Update dependencies
|
Pushed a commit to update the checked-in dependencies. Please mark the PR as ready for review to trigger PR checks. |
angelapwen
approved these changes
Aug 23, 2024
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.
Merging 2c779ab into
releases/v2.Conductor for this PR is @angelapwen.
Contains the following pull requests:
initstep #2441 (@angelapwen)Please do the following:
releases/v2branch.Create a merge commitis selected rather thanSquash and mergeorRebase and merge.