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

roachtest: maybe deflake change-replicas/mixed-version #98491

Merged

Conversation

erikgrinaker
Copy link
Contributor

Touches #98429.

Epic: none
Release note: None

@erikgrinaker erikgrinaker requested a review from a team March 13, 2023 14:07
@erikgrinaker erikgrinaker requested a review from a team as a code owner March 13, 2023 14:07
@erikgrinaker erikgrinaker self-assigned this Mar 13, 2023
@erikgrinaker erikgrinaker requested review from srosenberg and smg260 and removed request for a team March 13, 2023 14:07
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Contributor

@smg260 smg260 left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @srosenberg)

@erikgrinaker
Copy link
Contributor Author

bors r+

@craig
Copy link
Contributor

craig bot commented Mar 13, 2023

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Mar 13, 2023

Build succeeded:

@craig craig bot merged commit 36d39aa into cockroachdb:master Mar 13, 2023
@erikgrinaker erikgrinaker deleted the roachtest-mixed-version-replicas-retry branch March 21, 2023 08:52
@erikgrinaker
Copy link
Contributor Author

blathers backport 22.2

@blathers-crl
Copy link

blathers-crl bot commented Mar 30, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from a8c161c to blathers/backport-release-22.2-98491: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2 failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

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.

3 participants