Skip to content

serverctl: fix a docstring#108723

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20230814-yahor-nit
Aug 14, 2023
Merged

serverctl: fix a docstring#108723
craig[bot] merged 1 commit intocockroachdb:masterfrom
knz:20230814-yahor-nit

Conversation

@knz
Copy link
Copy Markdown
Contributor

@knz knz commented Aug 14, 2023

Requested by @yuzefovich in #108612 (review)

Release note: None
Epic: CRDB-26691

Release note: None
@knz knz added the backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only label Aug 14, 2023
@knz knz requested a review from yuzefovich August 14, 2023 16:56
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Aug 14, 2023

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

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

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Member

@yuzefovich yuzefovich left a comment

Choose a reason for hiding this comment

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

:lgtm: Thanks!

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

@knz
Copy link
Copy Markdown
Contributor Author

knz commented Aug 14, 2023

bors r=yuzefovich

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 14, 2023

This PR was included in a batch that was canceled, it will be automatically retried

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 14, 2023

This PR was included in a batch that timed out, it will be automatically retried

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 14, 2023

Build succeeded:

@craig craig bot merged commit 96b4a8e into cockroachdb:master Aug 14, 2023
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Aug 14, 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 209a343 to blathers/backport-release-23.1-108723: 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants