Skip to content

Conversation

@kbendick
Copy link
Contributor

@kbendick kbendick commented Oct 27, 2021

Some of the initial PRs that we're cherry-picking for 0.12.1 branch.

This is only the PRs that cherry-pick cleanly.

@kbendick
Copy link
Contributor Author

I skipped over the following 2 PRs as they don't merge cleanly:

After this, some PRs don't merge cleanly only because of the restructure. So I will edit those to be in line with the older structure (and then there's no difference).

I have a small script that can rebuild this at any time so if we want / need to take a different approach, it's not a problem at all.

@rdblue rdblue merged commit a7859dc into apache:0.12.x Oct 29, 2021
@rdblue
Copy link
Contributor

rdblue commented Oct 29, 2021

Merged. Thanks, @kbendick! I used Rebase & Merge to add all of these to the branch as individual cherry-picked commits.

@kbendick
Copy link
Contributor Author

Merged. Thanks, @kbendick! I used Rebase & Merge to add all of these to the branch as individual cherry-picked commits.

Great. Thank you @rdblue! I will make a PR (or two) with the remaining patches ASAP so we can cut a 0.12.1rc0.

@kbendick kbendick deleted the initial-cherrypicks-for-0.12.1 branch October 31, 2021 05:50
@kbendick kbendick changed the title [WIP] Initial cherrypicks for 0.12.1 Initial cherrypicks for 0.12.1 - Part 1 Nov 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants