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: fix sequelize nightly #74800

Merged
merged 1 commit into from
Jan 13, 2022

Conversation

rafiss
Copy link
Collaborator

@rafiss rafiss commented Jan 13, 2022

fixes #74057

Upstream changed how imports are done, so this library had to be
updated.

Release note: None

Upstream changed how imports are done, so this library had to be
updated.

Release note: None
@rafiss rafiss requested review from ZhouXing19 and a team January 13, 2022 15:22
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@rafiss
Copy link
Collaborator Author

rafiss commented Jan 13, 2022

bors r=otan

@craig
Copy link
Contributor

craig bot commented Jan 13, 2022

Build succeeded:

@craig craig bot merged commit ca44523 into cockroachdb:master Jan 13, 2022
@blathers-crl
Copy link

blathers-crl bot commented Jan 13, 2022

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 f0c13a9 to blathers/backport-release-21.2-74800: 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 21.2.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

@rafiss rafiss deleted the fix-sequelize-nightly branch January 20, 2022 04:35
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.

roachtest: sequelize failed
3 participants