Skip to content

licenses: Update BSL change date for master/22.1#71613

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
celiala:update-bsl-license.22.1
Oct 18, 2021
Merged

licenses: Update BSL change date for master/22.1#71613
craig[bot] merged 1 commit intocockroachdb:masterfrom
celiala:update-bsl-license.22.1

Conversation

@celiala
Copy link
Copy Markdown
Collaborator

@celiala celiala commented Oct 15, 2021

This commit updates the BSL license for master/22.1
(non-production code change).

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@celiala celiala force-pushed the update-bsl-license.22.1 branch from df794de to 1b85624 Compare October 15, 2021 15:53
@celiala celiala requested review from bdarnell and jlinder October 18, 2021 18:21
Copy link
Copy Markdown
Collaborator

@jlinder jlinder 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 @bdarnell and @celiala)


licenses/BSL.txt, line 18 at r1 (raw file):

                      controlled by such third parties.

Change Date:          2025-04-01

Should this be 2025-04-01 or 2025-05-01? i.e., do we do it for 3 years to the month the release is made in (we've been releasing in May, not April)?

Copy link
Copy Markdown
Contributor

@bdarnell bdarnell 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 @celiala and @jlinder)


licenses/BSL.txt, line 7 at r1 (raw file):

Licensor:             Cockroach Labs, Inc.
Licensed Work:        CockroachDB 22.1
                      The Licensed Work is (c) 2021 Cockroach Labs, Inc.

In the past we've updated the copyright year here to reflect the eventual release date (as in 186a625#diff-d20ea444c3b8b7b72100cc0990127b6e7785c6103e57d4c6e6eb25c96d525539). If we don't do it now we need to make sure it's on a checklist for the start of the new year.


licenses/BSL.txt, line 18 at r1 (raw file):

Previously, jlinder (James H. Linder) wrote…

Should this be 2025-04-01 or 2025-05-01? i.e., do we do it for 3 years to the month the release is made in (we've been releasing in May, not April)?

This doesn't need to be strictly tied to the release (i.e. there's no commitment anywhere that the change is three years from the release date. There is a commitment in the text of the BSL that the change date is no more than four years in the future).

I'd be inclined to just keep flipping back and forth between 04-01 and 10-01 change dates for consistency, but it would also be fine to make a better guess at the final release date if we wanted to (and it's fine if that guess is off in either direction).

This commit updates the BSL license for master/22.1
(non-production code change).

Release note: None
@celiala celiala force-pushed the update-bsl-license.22.1 branch from 1b85624 to 42a219f Compare October 18, 2021 21:26
Copy link
Copy Markdown
Collaborator Author

@celiala celiala left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @bdarnell and @jlinder)

a discussion (no related file):
TFTRs!



licenses/BSL.txt, line 7 at r1 (raw file):

Previously, bdarnell (Ben Darnell) wrote…

In the past we've updated the copyright year here to reflect the eventual release date (as in 186a625#diff-d20ea444c3b8b7b72100cc0990127b6e7785c6103e57d4c6e6eb25c96d525539). If we don't do it now we need to make sure it's on a checklist for the start of the new year.

Ack:

  • Updated the copyright year to 2022
  • Made a note in the docs / tracking issue (#70751), saying that the copyright year needs to be updated

licenses/BSL.txt, line 18 at r1 (raw file):

Previously, bdarnell (Ben Darnell) wrote…

This doesn't need to be strictly tied to the release (i.e. there's no commitment anywhere that the change is three years from the release date. There is a commitment in the text of the BSL that the change date is no more than four years in the future).

I'd be inclined to just keep flipping back and forth between 04-01 and 10-01 change dates for consistency, but it would also be fine to make a better guess at the final release date if we wanted to (and it's fine if that guess is off in either direction).

Ack:

  • I've updated the docs to default to flip between 04-01 and 10-01
  • Added your additional context in case we want to adjust this to a better guess in the future (will context will be helpful as we move towards more frequent releases)

@celiala
Copy link
Copy Markdown
Collaborator Author

celiala commented Oct 18, 2021

TFTRs!

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Oct 18, 2021

Build succeeded:

@craig craig bot merged commit c92936e into cockroachdb:master Oct 18, 2021
@celiala celiala deleted the update-bsl-license.22.1 branch April 5, 2022 04:25
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.

4 participants