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

kv: re-enable merge queue in TestSplitTriggerRaftSnapshotRace #46433

Conversation

nvanbenschoten
Copy link
Member

The merge queue was disabled in this test by df26cf6 due to the bug
found in #32784. That bug was fixed by #33312, so we can address the
TODO and re-enable merges in the test.

Release note: None
Release justification: test only

The merge queue was disabled in this test by df26cf6 due to the bug
found in cockroachdb#32784. That bug was fixed by cockroachdb#33312, so we can address the
TODO and re-enable merges in the test.

Release note: None
Release justification: test only
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Contributor

@andreimatei andreimatei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @andreimatei)

@nvanbenschoten
Copy link
Member Author

bors r+

@craig
Copy link
Contributor

craig bot commented Mar 23, 2020

Build failed (retrying...)

@craig
Copy link
Contributor

craig bot commented Mar 24, 2020

Build succeeded

@craig craig bot merged commit 21e6fa6 into cockroachdb:master Mar 24, 2020
@nvanbenschoten nvanbenschoten deleted the nvanbenschoten/reenableTestSplitTriggerRaftSnapshotRace branch March 30, 2020 19:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants