Skip to content

Revert "Revert "engineccl: ignore intents beneath start in MVCCIncrem…#33534

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
benesch:mvcc-inc-iterator
Jan 7, 2019
Merged

Revert "Revert "engineccl: ignore intents beneath start in MVCCIncrem…#33534
craig[bot] merged 1 commit intocockroachdb:masterfrom
benesch:mvcc-inc-iterator

Conversation

@benesch
Copy link
Copy Markdown
Contributor

@benesch benesch commented Jan 6, 2019

…entalIterator""

This reverts commit ceb4072. This previously caused flakiness in some CDC tests, but that's been fixed by #32487.

Release note: None

…entalIterator""

This reverts commit ceb4072.

Release note: None
@benesch benesch requested review from a team, bdarnell and tbg January 6, 2019 17:18
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@tbg
Copy link
Copy Markdown
Member

tbg commented Jan 7, 2019

LGTM

@benesch
Copy link
Copy Markdown
Contributor Author

benesch commented Jan 7, 2019

bors r=bdarnell,tbg

The test failure is a leaked goroutine that looks spurious and unrelated to this change.

craig bot pushed a commit that referenced this pull request Jan 7, 2019
33534: Revert "Revert "engineccl: ignore intents beneath start in MVCCIncrem… r=bdarnell,tbg a=benesch

…entalIterator""

This reverts commit ceb4072. This previously caused flakiness in some CDC tests, but that's been fixed by #32487.

Release note: None

Co-authored-by: Nikhil Benesch <nikhil.benesch@gmail.com>
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jan 7, 2019

Build succeeded

@craig craig bot merged commit 5daa101 into cockroachdb:master Jan 7, 2019
@benesch benesch deleted the mvcc-inc-iterator branch January 7, 2019 19:34
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.

4 participants