Skip to content

slack-vitess-r14.0.5: backport vitessio/vitess#13723#142

Merged
timvaillancourt merged 7 commits intoslack-vitess-r14.0.5from
pr-13723-slack-vitess-r14.0.5
Oct 13, 2023
Merged

slack-vitess-r14.0.5: backport vitessio/vitess#13723#142
timvaillancourt merged 7 commits intoslack-vitess-r14.0.5from
pr-13723-slack-vitess-r14.0.5

Conversation

@timvaillancourt
Copy link

@timvaillancourt timvaillancourt commented Oct 11, 2023

Description

Backport of vitessio#13723

Related Issue(s)

vitessio#13723

Checklist

  • "Backport to:" labels have been added if this change should be back-ported
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on the CI
  • Documentation was added or is not required

Deployment Notes

GuptaManan100 and others added 2 commits October 11, 2023 20:01
@GuptaManan100 @timvaillancourt
refactor: refactor vtorc tests to run as a single test with sub-tests (…
e7fee16 
…vitessio#11108)

Signed-off-by: Manan Gupta <manan@planetscale.com>

Signed-off-by: Manan Gupta <manan@planetscale.com>
@timvaillancourt @GuptaManan100
vtctld/vtorc: improve reparenting stats (vitessio#13723)
377eb20 
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: Manan Gupta <manan@planetscale.com>
Co-authored-by: Manan Gupta <manan@planetscale.com>
@timvaillancourt timvaillancourt added v14 upstream-backport An upstream backport labels Oct 11, 2023
@salesforce-cla
Copy link

salesforce-cla bot commented Oct 11, 2023

Thanks for the contribution! Before we can merge this, we need @GuptaManan100 to sign the Salesforce Inc. Contributor License Agreement.

@timvaillancourt
revert changes to go/test/endtoend
f973f54 
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@timvaillancourt
remove unrelated+incompatible test
76e2315 
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@timvaillancourt
Fix memorytopo.NewServer(...) for v14
7b9419f 
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@timvaillancourt
remove non-existant "PrimaryStatusResults" field
0e3466b 
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@timvaillancourt timvaillancourt marked this pull request as ready for review October 12, 2023 18:40
@timvaillancourt timvaillancourt requested a review from a team as a code owner October 12, 2023 18:40
@salesforce-cla
Copy link

salesforce-cla bot commented Oct 13, 2023

Thanks for the contribution! Before we can merge this, we need @GuptaManan100 @rohit-nayak-ps to sign the Salesforce Inc. Contributor License Agreement.

@timvaillancourt timvaillancourt merged commit 51c1507 into slack-vitess-r14.0.5 Oct 13, 2023
@timvaillancourt timvaillancourt deleted the pr-13723-slack-vitess-r14.0.5 branch October 13, 2023 13:16
@tanjinx tanjinx added the PRS reparent label Feb 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ejortegau ejortegau ejortegau approved these changes

+1 more reviewer

@darenseagrave darenseagrave darenseagrave approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cla:missing PRS reparent upstream-backport An upstream backport v14

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@timvaillancourt @ejortegau @darenseagrave @tanjinx @GuptaManan100 @rohit-nayak-ps