/cockroach

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

storage: move MergeQueueEnabled to storagebase #31312

Merged
merged 1 commit into from Oct 13, 2018

Conversation

Reviewers

@tschottdorf tschottdorf

@cockroachdb/core-prs core-prs

@cockroachdb/sql-execution-prs sql-execution-prs

@cockroachdb/sql-planning-prs sql-planning-prs

@benesch benesch

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@jordanlewis @cockroach-teamcity @tschottdorf
@jordanlewis
Member

jordanlewis commented Oct 12, 2018 •
edited

... to avoid dependency edge from sql to storage.

Updates #30001.

Release note: None

@jordanlewis jordanlewis requested a review from benesch Oct 12, 2018

@jordanlewis jordanlewis requested review from cockroachdb/core-prs as code owners Oct 12, 2018

@cockroach-teamcity

This comment has been minimized.

Show comment
Hide comment
@cockroach-teamcity

cockroach-teamcity Oct 12, 2018

Member

This change is Reviewable
Member

cockroach-teamcity commented Oct 12, 2018

This change is Reviewable
@tschottdorf

tschottdorf approved these changes Oct 12, 2018
View changes

:lgtm:

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

@jordanlewis

This comment has been minimized.

Show comment
Hide comment
@jordanlewis

jordanlewis Oct 13, 2018

Member

bors r+
Member

jordanlewis commented Oct 13, 2018

bors r+
@craig

This comment has been minimized.

Show comment
Hide comment
@craig

craig bot Oct 13, 2018

Merge conflict (retrying...)

craig bot commented Oct 13, 2018

Merge conflict (retrying...)
@craig

This comment has been minimized.

Show comment
Hide comment
@craig

craig bot Oct 13, 2018

Merge conflict

craig bot commented Oct 13, 2018

Merge conflict
@jordanlewis
storage: move MergeQueueEnabled to storagebase 
... to avoid dependency edge from sql to storage.

Release note: None
Verified
This commit was signed with a verified signature.
@jordanlewis jordanlewis Jordan Lewis
GPG key ID: CB92F5D43A08059A Learn about signing commits
Loading status checks…
6bdcfd0
@jordanlewis

This comment has been minimized.

Show comment
Hide comment
@jordanlewis

jordanlewis Oct 13, 2018

Member

bors r+
Member

jordanlewis commented Oct 13, 2018

bors r+

craig bot pushed a commit that referenced this pull request Oct 13, 2018

craig[bot] @jordanlewis
Merge #31312 
31312: storage: move MergeQueueEnabled to storagebase r=jordanlewis a=jordanlewis

... to avoid dependency edge from sql to storage.

Updates #30001.

Release note: None

Co-authored-by: Jordan Lewis <jordanthelewis@gmail.com>
Loading status checks…
3960772
@craig

This comment has been minimized.

Show comment
Hide comment
@craig

craig bot Oct 13, 2018

Build succeeded

craig bot commented Oct 13, 2018

Build succeeded

@craig craig bot merged commit 6bdcfd0 into cockroachdb:master Oct 13, 2018
3 checks passed

3 checks passed

GitHub CI (Cockroach) TeamCity build finished
Details
bors Build succeeded
Details
license/cla Contributor License Agreement is signed.
Details

@jordanlewis jordanlewis deleted the jordanlewis:move-settings branch Oct 13, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment