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 commit tagged as v1.12.2 into the release branch #1084

Merged
merged 3 commits into from Jul 12, 2022

Conversation

beorn7
Copy link
Member

@beorn7 beorn7 commented Jul 7, 2022

This also removes leftovers from merge conflicts that somehow made it into the release branch (but were never released, because the released commit wasn't in the release branch in the first place ;).

@beorn7 beorn7 requested review from kakkoyun and bwplotka July 7, 2022 16:47
@beorn7
Copy link
Member Author

beorn7 commented Jul 7, 2022

Fixes #1083

@beorn7
Copy link
Member Author

beorn7 commented Jul 7, 2022

Not sure where the lint errors are coming from. Besides the updated VERSION, there is no difference between this and the released code.

@kakkoyun
Copy link
Member

kakkoyun commented Jul 7, 2022

Not sure where the lint errors are coming from. Besides the updated VERSION, there is no difference between this and the released code.

I think it's because we have enabled additional linters after these commits #1056

@beorn7
Copy link
Member Author

beorn7 commented Jul 11, 2022

Is this good to merge then?

@kakkoyun kakkoyun merged commit 082c0a2 into release-1.12 Jul 12, 2022
@kakkoyun kakkoyun deleted the beorn7/release branch July 12, 2022 05:58
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.

None yet

2 participants