/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

webui: fix display of merges in rangelog #31543

Merged
merged 1 commit into from Oct 17, 2018

Conversation

Reviewers

@vilterp vilterp

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

tschottdorf commented Oct 17, 2018

It would previously show "unknown".

Observed in #31409.

Release note: None
@tschottdorf
webui: fix display of merges in rangelog 
It would previously show "unknown".

Observed in #31409.

Release note: None
Loading status checks…
67f0b69

@tschottdorf tschottdorf requested a review from cockroachdb/admin-ui-prs as a code owner Oct 17, 2018

@cockroach-teamcity

This comment has been minimized.

Show comment
Hide comment
@cockroach-teamcity

cockroach-teamcity Oct 17, 2018

Member

This change is Reviewable
Member

cockroach-teamcity commented Oct 17, 2018

This change is Reviewable
@tschottdorf

This comment has been minimized.

Show comment
Hide comment
@tschottdorf

tschottdorf Oct 17, 2018

Member

bors r=vilterp
Member

tschottdorf commented Oct 17, 2018

bors r=vilterp

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

craig[bot] @tschottdorf
Merge #31538 #31543 
31538: storage: resolve intents synchronously for splits/merges r=bdarnell a=tschottdorf

The resolve allowance isn't known to ever have fired for splits/merges
(it might be trigger-able with giant start/end keys), but it worried me
when I ran across it in:

#28005 (comment)

Release note: None

31543: webui: fix display of merges in rangelog r=vilterp a=tschottdorf

It would previously show "unknown".

Observed in #31409.

Release note: None

Co-authored-by: Tobias Schottdorf <tobias.schottdorf@gmail.com>
Loading status checks…
f03d78c
@craig

This comment has been minimized.

Show comment
Hide comment
@craig

craig bot Oct 17, 2018

Build succeeded

craig bot commented Oct 17, 2018

Build succeeded

@craig craig bot merged commit 67f0b69 into cockroachdb:master Oct 17, 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment