Skip to content

Conversation

@spilchen
Copy link
Contributor

@spilchen spilchen commented Sep 5, 2024

This renames the usage field in the license protobuf to environment and deprecates the NonCommercial type.

Epic: CRDB-39988
Informs: CRDB-40069
Release note: none

@spilchen spilchen added backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only backport-23.2.x PAST MAINTENANCE SUPPORT: 23.2 patch releases via ER request only backport-24.1.x Flags PRs that need to be backported to 24.1. backport-24.2.x labels Sep 5, 2024
@spilchen spilchen requested review from a team and fantapop September 5, 2024 13:44
@spilchen spilchen self-assigned this Sep 5, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@fqazi fqazi left a comment

Choose a reason for hiding this comment

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

:lgtm:

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

This renames the usage field in the license protobuf to environment and
deprecates the NonCommercial type.

Epic: CRDB-39988
Closes: CRDB-40069
Release note: none
@spilchen spilchen force-pushed the crdb-40069/2nd-proto-changes branch from ae42a43 to fcdc4ea Compare September 5, 2024 19:40
Copy link
Contributor

@dcrosta dcrosta left a comment

Choose a reason for hiding this comment

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

lgtm!

@spilchen
Copy link
Contributor Author

spilchen commented Sep 5, 2024

TFTR!

bors r+

@craig craig bot merged commit 080e478 into cockroachdb:master Sep 5, 2024
@blathers-crl
Copy link

blathers-crl bot commented Sep 5, 2024

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 fcdc4ea to blathers/backport-release-23.1-130161: 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.


error creating merge commit from fcdc4ea to blathers/backport-release-23.2-130161: 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.2.x failed. See errors above.


error creating merge commit from fcdc4ea to blathers/backport-release-24.1-130161: 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 24.1.x failed. See errors above.


error creating merge commit from fcdc4ea to blathers/backport-release-24.2-130161: 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 24.2.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 backport-23.2.x PAST MAINTENANCE SUPPORT: 23.2 patch releases via ER request only backport-24.1.x Flags PRs that need to be backported to 24.1.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants