Skip to content

Commit

Permalink
Merge pull request #124661 from rail/backportrelease-23.2.6-rc-124660
Browse files Browse the repository at this point in the history
release-23.2: update licenses
  • Loading branch information
rail authored May 28, 2024
2 parents 7cec751 + 9eddfe2 commit 7b037e2
Show file tree
Hide file tree
Showing 5 changed files with 116,112 additions and 9 deletions.
13 changes: 4 additions & 9 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
Source code in this repository is variously licensed under the Business Source
License 1.1 (BSL), the CockroachDB Community License (CCL), the MIT license, and
BSD-style licenses. A copy of each license can be found in the licenses
directory. Source code in a given file is licensed under the BSL and the
copyright belongs to The Cockroach Authors unless otherwise noted at the
beginning of the file.

Running `make` will produce a binary that includes CCL-licensed code and is thus
subject to the terms of the CCL. To produce a binary that is free of CCL-
licensed code, run `make buildoss`.
License 1.1 (BSL), the CockroachDB Community License (CCL), the MIT license,
BSD-style licenses, and other licenses specified in the source code. Source
code in a given file is licensed under the BSL and the copyright belongs to The
Cockroach Authors unless otherwise noted at the beginning of the file.
12 changes: 12 additions & 0 deletions licenses/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
CockroachDB is variously licensed under the Business Source License 1.1 (BSL)
and/or the CockroachDB Community License (CCL). You can see which license
applies to the various CockroachDB features on this page:
https://www.cockroachlabs.com/docs/stable/licensing-faqs#feature-licensing. The
default license for anything not listed is the CCL.

The CockroachDB Community License is available at
https://www.cockroachlabs.com/cockroachdb-community-license/.

You can find the applicable Business Source License by reviewing the BSL
license in the Licenses folder for the applicable version of CockroachDB at
https://github.com/cockroachdb/cockroach.
Loading

0 comments on commit 7b037e2

Please sign in to comment.