Merge main into releases/v2 #1885

github-actions · 2023-09-14T16:10:24Z

Merging e982de4 into releases/v2.

Conductor for this PR is @cklin.

Contains the following pull requests:

Please do the following:

Ensure the CHANGELOG displays the correct version and date.
Ensure the CHANGELOG includes all relevant, user-facing changes since the last release.
Check that there are not any unexpected commits being merged into the releases/v2 branch.
Ensure the docs team is aware of any documentation changes that need to be released.
Approve and merge this PR. Make sure Create a merge commit is selected rather than Squash and merge or Rebase and merge.
Merge the mergeback PR that will automatically be created once this PR is merged.

Mergeback v2.21.6 refs/heads/releases/v2 into main

Remove --pr in update-dependencies.yml

Update default bundle to 2.14.5

github-actions bot and others added 9 commits September 13, 2023 16:39

Update changelog and version after v2.21.6

70c4c0f

Update checked-in dependencies

f664957

Remove --pr in update-dependencies.yml

77a54b6

Merge pull request #1876 from github/mergeback/v2.21.6-to-main-701f152f

8efd40b

Mergeback v2.21.6 refs/heads/releases/v2 into main

Merge pull request #1877 from cklin/update-dependencies

c6c77c8

Remove --pr in update-dependencies.yml

Update default bundle to codeql-bundle-v2.14.5

71c7e82

Add changelog note

19c02a4

Merge pull request #1882 from github/update-bundle/codeql-bundle-v2.14.5

e982de4

Update default bundle to 2.14.5

Update changelog for v2.21.7

bb3bc25

github-actions bot assigned cklin Sep 14, 2023

cklin marked this pull request as ready for review September 14, 2023 16:14

cklin requested a review from a team as a code owner September 14, 2023 16:14

henrymercer approved these changes Sep 14, 2023

View reviewed changes

cklin merged commit 04daf01 into releases/v2 Sep 14, 2023
364 checks passed

cklin deleted the update-v2.21.7-e982de4fb branch September 14, 2023 16:56

Provide feedback