Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge releases/v3 into releases/v2 #2144

Merged
merged 28 commits into from
Feb 15, 2024
Merged

Conversation

henrymercer
Copy link
Contributor

@henrymercer henrymercer commented Feb 15, 2024

Merging ece8414 into releases/v2.

Conductor for this PR is @angelapwen.

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.
  • Remove and re-add the "Update dependencies" label to the PR to trigger just this workflow.
  • Wait for the "Update dependencies" workflow to push a commit updating the dependencies.
  • Mark the PR as ready for review to trigger the full set of PR checks.
  • Approve and merge this PR. Make sure Create a merge commit is selected rather than Squash and merge or Rebase and merge.

henrymercer and others added 26 commits February 12, 2024 23:11
Remove some inadvertently checked in build files
This prevents it from becoming part of the analysis.
Mergeback v3.24.1 refs/heads/releases/v3 into main
Avoid analyzing generated configuration file
…for-branch

Add backticks around branch in update-release-branch PR template
…licts

Teach rebuild Action how to resolve conflicts in lib
 Introduce a rollback mechanism for Java buildless
Deprecate fine-grained parallelism feature-flag
Co-authored-by: Henry Mercer <[email protected]>
@henrymercer henrymercer added the Update dependencies Trigger PR workflow to update dependencies label Feb 15, 2024
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Feb 15, 2024
Copy link
Contributor

Pushed a commit to update the checked-in dependencies. Please mark the PR as ready for review to trigger PR checks.

@henrymercer henrymercer marked this pull request as ready for review February 15, 2024 11:11
@henrymercer henrymercer requested a review from a team as a code owner February 15, 2024 11:11
@angelapwen angelapwen enabled auto-merge February 15, 2024 11:24
@angelapwen angelapwen merged commit 8b6a45a into releases/v2 Feb 15, 2024
591 checks passed
@angelapwen angelapwen deleted the backport-v2.24.2-ece8414c7 branch February 15, 2024 11:34
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.

5 participants