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 release 2.14.0 into 3.0.x #10324

Merged
merged 2 commits into from
Dec 19, 2022
Merged

Conversation

github-actions[bot]
Copy link
Contributor

Release Notes for 2.14.0

2.14.0

  • Total issues resolved: 0
  • Total pull requests resolved: 43
  • Total contributors: 10

Improvement

Static Analysis

New Feature

Test Suite

Deprecation,Static Analysis

Deprecation

Documentation,Improvement

Bug

Deprecation,Documentation

SenseException
SenseException previously approved these changes Dec 19, 2022
@SenseException
Copy link
Member

SenseException commented Dec 19, 2022

@greg0ire Were there missing merges or a rebase between other branches to 2.14.x-merge-up-into-3.0.x_YfifaF7w?

@greg0ire
Copy link
Member

When you approved, there were conflicts between #10320, that relates to annotations, and 3.0.x, that drops them from the codebase. I resolved them locally, then force pushed here.

@SenseException
Copy link
Member

Thank you, I missed that part.

@greg0ire greg0ire merged commit 2e2bca8 into 3.0.x Dec 19, 2022
@greg0ire greg0ire deleted the 2.14.x-merge-up-into-3.0.x_YfifaF7w branch December 19, 2022 22:57
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.

3 participants