Add changes from 2021.3.3#13388
Merged
Merged
Conversation
See test results for failed build of commit 48fa520ed6 |
feerrenrut
approved these changes
Feb 24, 2022
Contributor
feerrenrut
left a comment
There was a problem hiding this comment.
Assuming the tests pass.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary of the issue:
Initially changes for 2021.3.1 were delivered to beta, subsequently it was decided to avoid complications with translations, to make changes directly on RC.
The changes were cherry picked from beta.
There were then several more changes made squashed / merged to RC
These changes need to be cherry picked back into the beta branch.
This was done in #13185
Changes for 2021.3.3 were cherrypicked directly to rc.
But because rc and beta/master have diverged, these changes need to be cherrypicked back to master and beta.
An exchange of merging master and beta has already occurred since the last release.
As a result, these changes need to be cherry-picked directly to master, to get eventually merged to beta.
Description of how this pull request fixes the issue:
release-2021.3.3No other introduced changes from 2021.3.2 and 2021.3.3 need to be cherry-picked back to master.
This is because 2021.3.2 and 2021.3.3 was created from code existing on master.
Testing strategy:
As beta has already had master merged into it, the strategy here is more complicated than in #13185
Check the diff between releases
Check the diff between release-2021.3.3 and rc is empty
Check what the merge between
release-2021.3.3and master creates,confirm nothing is missing from this PR that needs to be introduced on master as a cherrypick.
Abort the merge
Known issues with pull request:
Change log entries:
None
Code Review Checklist: