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: update import-cancellation owner to queries #109251

Merged
merged 1 commit into from
Aug 24, 2023

Conversation

dt
Copy link
Member

@dt dt commented Aug 22, 2023

Release note: none.
Epic: none.

@dt dt requested a review from stevendanna August 22, 2023 16:45
@dt dt requested a review from a team as a code owner August 22, 2023 16:45
@dt dt requested review from srosenberg and smg260 and removed request for a team August 22, 2023 16:45
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@dt
Copy link
Member Author

dt commented Aug 24, 2023

TFTR!

bors r+

@dt dt added the backport-23.1.x Flags PRs that need to be backported to 23.1 label Aug 24, 2023
@craig
Copy link
Contributor

craig bot commented Aug 24, 2023

Build succeeded:

@craig craig bot merged commit 7437f5e into cockroachdb:master Aug 24, 2023
@blathers-crl
Copy link

blathers-crl bot commented Aug 24, 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 6621f3a to blathers/backport-release-23.1-109251: 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 23.1.x failed. See errors above.


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

@dt dt deleted the queries branch August 29, 2023 13:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants