-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
Port #51684 to master #57500
Port #51684 to master #57500
Conversation
@terminalmage mind fixing the merge conflict here? |
316229b
to
93a4925
Compare
36ccf7b
to
b4ea4ca
Compare
@Ch3LL There's one failing test here but it seems to be a timeout on standing up the Windows VM to run the test. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will also require a changelog
That shouldn't be related. If you could rebase on master before you push the changes I requested and we will see if it fails again. Its not failing like that on the branch tests. |
b4ea4ca
to
89a7705
Compare
@Ch3LL I thought I already had rebased onto master, but I might be mistaken. I did a rebase, and I think I've covered all the review comments. |
See #51684