Merge releases/v3 into releases/v2 #2446
Merged
Commits on Aug 21, 2024
-
-
-
Merge pull request #2438 from github/mergeback/v3.26.4-to-main-f0f3afee
Mergeback v3.26.4 refs/heads/releases/v3 into main
Commits on Aug 23, 2024
-
Only run check SIP enablement once in
initstep (#2441)Co-authored-by: Henry Mercer <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
3 people authoredAug 23, 2024 -
-
Merge main into releases/v3 (#2444)
* 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]>
3 people authoredAug 23, 2024 -
Revert "Update version and changelog for v2.26.4"
This reverts commit 1de3044.
-
Revert "Update checked-in dependencies"
This reverts commit 4799b0f.
-
-
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.