Port #51684 to master - #57500
Merged
Merged
Conversation
xeacott
previously approved these changes
Jun 3, 2020
Contributor
|
@terminalmage mind fixing the merge conflict here? |
terminalmage
force-pushed
the
bp-51684
branch
2 times, most recently
from
November 1, 2022 12:57
36ccf7b to
b4ea4ca
Compare
Contributor
Author
|
@Ch3LL There's one failing test here but it seems to be a timeout on standing up the Windows VM to run the test. |
Ch3LL
suggested changes
Nov 1, 2022
Ch3LL
left a comment
Ch3LL
left a comment
Contributor
There was a problem hiding this comment.
This will also require a changelog
Contributor
|
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. |
terminalmage
force-pushed
the
bp-51684
branch
from
November 1, 2022 19:48
b4ea4ca to
89a7705
Compare
Contributor
Author
|
@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. |
Ch3LL
approved these changes
Nov 3, 2022
Ch3LL
added
Sulfur v3006.0
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
7 participants
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.
See #51684