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

vendor: bump Pebble to 9af7bb126851 #54194

Merged
merged 1 commit into from
Sep 10, 2020

Conversation

jbowens
Copy link
Collaborator

@jbowens jbowens commented Sep 10, 2020

9af7bb12 db: close previous WAL before linking next WAL
06b3565a *: Add compactionOutputSplitter, refactor compaction output switch logic
caf883db *: add includesBase argument to ValueMerger.Finish

Fixes #54164.
Fixes #54079.

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Member

@itsbilal itsbilal left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 5 of 5 files at r1.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained

@jbowens
Copy link
Collaborator Author

jbowens commented Sep 10, 2020

TFTR!

bors r+

@craig
Copy link
Contributor

craig bot commented Sep 10, 2020

Merge conflict.

```
d7a278ab compaction: Ensure that user keys aren't split across SSTs when flushing
9af7bb12 db: close previous WAL before linking next WAL
06b3565a *: Add compactionOutputSplitter, refactor compaction output switch logic
caf883db *: add includesBase argument to ValueMerger.Finish
```

Release note: none
@jbowens
Copy link
Collaborator Author

jbowens commented Sep 10, 2020

collided with another PR modifying the vendored repo.

bors r+

@craig
Copy link
Contributor

craig bot commented Sep 10, 2020

Build succeeded:

@craig craig bot merged commit c2d78fe into cockroachdb:master Sep 10, 2020
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.

roachtest: acceptance/gossip/restart-node-one failed roachtest: acceptance/version-upgrade failed
3 participants