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.

Sign up for GitHub

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

Jump to bottom

clusterversion: introduce 21.2 development versions #64391

Merged
merged 1 commit into from
Apr 30, 2021
Merged

clusterversion: introduce 21.2 development versions #64391

merged 1 commit into from
Apr 30, 2021

Conversation

j-low
Copy link
Contributor

@j-low j-low commented Apr 29, 2021

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@j-low j-low requested a review from dt April 29, 2021 16:15
@dt
Copy link
Member

dt commented Apr 29, 2021

I think this PR wants to be rebased on your other one so it has version 21_1 before 21_2 start?

@j-low
Copy link
Contributor Author

j-low commented Apr 29, 2021 •
edited
Loading

Ah yes I think so. Once that merges, I'll rebase and push.

@itsbilal itsbilal mentioned this pull request Apr 29, 2021
Merged
@j-low
Copy link
Contributor Author

j-low commented Apr 30, 2021

bors r+

@craig
Copy link
Contributor

craig bot commented Apr 30, 2021

Build succeeded:

@craig craig bot merged commit 42e2e42 into cockroachdb:master Apr 30, 2021
@irfansharif irfansharif mentioned this pull request Apr 30, 2021
Closed
craig bot pushed a commit that referenced this pull request May 1, 2021
@itsbilal
Merge #64413
684e753 
64413: clusterversion: Move JoinTokensTable,AcquisitionTypeInLeaseHistory to 21.2 r=dt a=itsbilal

First commit is #64391.

This change moves the cluster versions JoinTokensTable and
AcquisitionTypeInLeaseHistory to sort after 21.1, as neither
of these changes will be backported to 21.1. The JoinTokensTable
migration is idempotent so it's okay if it runs twice on a
small set of nodes.

Release note: None.

Co-authored-by: Bilal Akhtar <bilal@cockroachlabs.com>
This was referenced May 3, 2021
Closed
Closed
Closed
Closed
Closed
Closed
Closed
@j-low j-low deleted the start-21.2 branch May 3, 2021 20:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dt dt Awaiting requested review from dt

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@j-low @cockroach-teamcity @dt