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

[stable17] Backport #18120 #18205

Merged
merged 1 commit into from
Dec 4, 2019
Merged

[stable17] Backport #18120 #18205

merged 1 commit into from
Dec 4, 2019

Conversation

georgehrke
Copy link
Member

Backport of #18120

@georgehrke georgehrke added the 3. to review Waiting for reviews label Dec 3, 2019
@georgehrke
Copy link
Member Author

@rullzer Is a backport to stable16 necessary? Literally every modified file gave me a conflict while cherry-picking on 16.

@rullzer
Copy link
Member

rullzer commented Dec 4, 2019

@georgehrke ideally yes... big conflicts or?

@rullzer rullzer merged commit f032b88 into stable17 Dec 4, 2019
@rullzer rullzer deleted the stable17-backport/18120 branch December 4, 2019 13:12
@georgehrke
Copy link
Member Author

Let me try my best.

@rullzer rullzer mentioned this pull request Dec 11, 2019
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants