Skip to content

release-21.2: licenses: updating licenses#71025

Merged
celiala merged 2 commits intorelease-21.2from
blathers/backport-release-21.2-69904
Oct 13, 2021
Merged

release-21.2: licenses: updating licenses#71025
celiala merged 2 commits intorelease-21.2from
blathers/backport-release-21.2-69904

Conversation

@blathers-crl
Copy link
Copy Markdown

@blathers-crl blathers-crl bot commented Oct 1, 2021

Backport 2/2 commits from #69904 on behalf of @celiala.

/cc @cockroachdb/release

As part of Creating a release branch for release-21.2, this PR:

  • Adds the following new licenses:
    • BSL-1.0 (Boost Software License)
    • CC-BY-3.0
    • CC0-1.0
    • JSON
    • MPL-2.0
    • The Unlicense
  • Updates the BSL change date for 21.2 (we missed updating this last Spring; a separate PR will update this for master/22.1 after branch cut).

This PR is one of the tasks detailed in #70751, which tracks all the steps relevant to creating a release branch for ${vBRANCH_CUT} and preparing master for the ${vNEXT} major version.

Release justification: Non-production code change
Release note: None

Release justification:

@celiala
licenses: Update BSL change date for master/21.2
f22a3a1 
updating BSL license for release branch 21.2

Release justification: Non-production code change
Release note: None
@celiala
licenses: updating licenses
0635842 
Release justification: Non-production code change
Release note: None
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-21.2-69904 branch from ac320e8 to 0635842 Compare October 1, 2021 23:38
@blathers-crl
Copy link
Copy Markdown
Author

blathers-crl bot commented Oct 1, 2021

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@blathers-crl blathers-crl bot requested review from bdarnell, celiala and jlinder October 1, 2021 23:38
@cockroach-teamcity
Copy link
Copy Markdown
Member

cockroach-teamcity commented Oct 1, 2021

This change is Reviewable

@celiala
Copy link
Copy Markdown
Collaborator

celiala commented Oct 13, 2021

TFTR! Will merge once CI passes (just restarted)

@celiala celiala mentioned this pull request Oct 13, 2021
Closed
19 tasks
@celiala celiala merged commit 3624a35 into release-21.2 Oct 13, 2021
@celiala celiala deleted the blathers/backport-release-21.2-69904 branch October 13, 2021 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jlinder jlinder jlinder approved these changes

@bdarnell bdarnell Awaiting requested review from bdarnell

@celiala celiala Awaiting requested review from celiala

Assignees

@celiala celiala

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@cockroach-teamcity @celiala @jlinder