From 767419b488a1122290e8900d16a973320d31fd05 Mon Sep 17 00:00:00 2001 From: Gemma Shay Date: Wed, 27 Jan 2021 14:50:49 -0500 Subject: [PATCH 1/3] add licensing info to README --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index 005a4f38c9cc..c20a7c10c42b 100644 --- a/README.md +++ b/README.md @@ -104,6 +104,22 @@ Guide](https://www.cockroachlabs.com/docs/stable/architecture/overview.html). For the original design motivation, see our [design doc](https://github.com/cockroachdb/cockroach/blob/master/docs/design.md). +## Licensing + +Current CockroachDB code is licensed in three ways: + +- [Business Source License (BSL)](https://www.cockroachlabs.com/docs/stable/licensing.html#bsl) +- [Cockroach Community License (Free)](https://www.cockroachlabs.com/docs/stable/licensing.html#ccl-free) +- [Cockroach Community License (Paid)](https://www.cockroachlabs.com/docs/stable/licensing.html#ccl-paid) + +Core features released up to and including version 19.1 are licensed under [Apache 2.0](https://www.cockroachlabs.com/docs/stable/licensing.html#apache). After version 19.1, core features are licensed under the BSL for three years before converting to the Apache 2.0 license. + +BSL features are free to use and the source code is available, but users may not use CockroachDB as a service without an agreement with Cockroach Labs. Outside of this usage, BSL features will continue to be free to use and source code will continue to be available. + +[Certain core features](https://www.cockroachlabs.com/docs/stable/licensing.html#core-feature-licensing) and all enterprise features are licensed under the Cockroach Community License (CCL). + +For more information, see [Licensing](https://www.cockroachlabs.com/docs/stable/licensing.html). + ## Comparison with Other Databases To see how key features of CockroachDB stack up against other databases, From 9b554a4ec938f9376230f75f03db88e7e63c012d Mon Sep 17 00:00:00 2001 From: Gemma Shay Date: Wed, 27 Jan 2021 17:32:16 -0500 Subject: [PATCH 2/3] removed summary and added info for contributors --- README.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index c20a7c10c42b..1f4c546ce61d 100644 --- a/README.md +++ b/README.md @@ -106,17 +106,9 @@ doc](https://github.com/cockroachdb/cockroach/blob/master/docs/design.md). ## Licensing -Current CockroachDB code is licensed in three ways: +Current CockroachDB code is released under a combination of two licenses, the [Business Source License (BSL)](https://www.cockroachlabs.com/docs/stable/licensing.html#bsl) and the [Cockroach Community License (CCL)](https://www.cockroachlabs.com/docs/stable/licensing.html#ccl-free). -- [Business Source License (BSL)](https://www.cockroachlabs.com/docs/stable/licensing.html#bsl) -- [Cockroach Community License (Free)](https://www.cockroachlabs.com/docs/stable/licensing.html#ccl-free) -- [Cockroach Community License (Paid)](https://www.cockroachlabs.com/docs/stable/licensing.html#ccl-paid) - -Core features released up to and including version 19.1 are licensed under [Apache 2.0](https://www.cockroachlabs.com/docs/stable/licensing.html#apache). After version 19.1, core features are licensed under the BSL for three years before converting to the Apache 2.0 license. - -BSL features are free to use and the source code is available, but users may not use CockroachDB as a service without an agreement with Cockroach Labs. Outside of this usage, BSL features will continue to be free to use and source code will continue to be available. - -[Certain core features](https://www.cockroachlabs.com/docs/stable/licensing.html#core-feature-licensing) and all enterprise features are licensed under the Cockroach Community License (CCL). +When contributing to a CockroachDB feature, you can find the relevant license in the comments at the top of each file. For more information, see [Licensing](https://www.cockroachlabs.com/docs/stable/licensing.html). From c99c17c9b15876a4b4f60aa6aa10226b74c54ce4 Mon Sep 17 00:00:00 2001 From: Gemma Shay Date: Thu, 18 Feb 2021 13:53:29 -0500 Subject: [PATCH 3/3] change licensing back to faqs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1f4c546ce61d..8d398cd89646 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ Current CockroachDB code is released under a combination of two licenses, the [B When contributing to a CockroachDB feature, you can find the relevant license in the comments at the top of each file. -For more information, see [Licensing](https://www.cockroachlabs.com/docs/stable/licensing.html). +For more information, see the [Licensing FAQs](https://www.cockroachlabs.com/docs/stable/licensing-faqs.html). ## Comparison with Other Databases