IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-26 02:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

cla.md formatting update to match cla-assistant (#33188)

Browse Source 
@RichiH
This commit is contained in:
Nicholas Auger 2021-04-20 13:56:12 -04:00 committed by GitHub
parent 9ef7770631
commit fa620c1c38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docs/sources/developers/cla.md
View File

@ -3,10 +3,8 @@ title = "Contributor License Agreement (CLA)"
description = "Contributor License Agreement (CLA)" description = "Contributor License Agreement (CLA)"
aliases = ["/docs/grafana/latest/project/cla", "docs/contributing/cla.html"] aliases = ["/docs/grafana/latest/project/cla", "docs/contributing/cla.html"]
+++ +++
# Grafana Labs Contributor License Agreement
Grafana Labs # Grafana Labs Software Grant and Contributor License Agreement ("Agreement")
Software Grant and Contributor License Agreement ("Agreement")
This agreement is based on the Apache Software Foundation Contributor License Agreement. This agreement is based on the Apache Software Foundation Contributor License Agreement.
(v r190612) (v r190612)
@ -27,7 +25,7 @@ You accept and agree to the following terms and conditions for Your
for the license granted herein to Grafana Labs and recipients of for the license granted herein to Grafana Labs and recipients of
software distributed by Grafana Labs, You reserve all right, title, software distributed by Grafana Labs, You reserve all right, title,
and interest in and to Your Contributions. and interest in and to Your Contributions.
1. Definitions. ## 1. Definitions.
"You" (or "Your") shall mean the copyright owner or legal entity "You" (or "Your") shall mean the copyright owner or legal entity
authorized by the copyright owner that is making this Agreement authorized by the copyright owner that is making this Agreement
with Grafana Labs. For legal entities, the entity making a with Grafana Labs. For legal entities, the entity making a
@ -50,14 +48,14 @@ You accept and agree to the following terms and conditions for Your
purpose of discussing and improving the Work, but excluding purpose of discussing and improving the Work, but excluding
communication that is conspicuously marked or otherwise designated communication that is conspicuously marked or otherwise designated
in writing by You as "Not a Contribution." in writing by You as "Not a Contribution."
2. Grant of Copyright License. Subject to the terms and conditions ## 2. Grant of Copyright License. Subject to the terms and conditions
of this Agreement, You hereby grant to Grafana Labs and to of this Agreement, You hereby grant to Grafana Labs and to
recipients of software distributed by Grafana Labs a perpetual, recipients of software distributed by Grafana Labs a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare derivative works of, copyright license to reproduce, prepare derivative works of,
publicly display, publicly perform, sublicense, and distribute publicly display, publicly perform, sublicense, and distribute
Your Contributions and such derivative works. Your Contributions and such derivative works.
3. Grant of Patent License. Subject to the terms and conditions of ## 3. Grant of Patent License. Subject to the terms and conditions of
this Agreement, You hereby grant to Grafana Labs and to recipients this Agreement, You hereby grant to Grafana Labs and to recipients
of software distributed by Grafana Labs a perpetual, worldwide, of software distributed by Grafana Labs a perpetual, worldwide,
non-exclusive, no-charge, royalty-free, irrevocable (except as non-exclusive, no-charge, royalty-free, irrevocable (except as
@ -73,15 +71,15 @@ You accept and agree to the following terms and conditions for Your
direct or contributory patent infringement, then any patent licenses direct or contributory patent infringement, then any patent licenses
granted to that entity under this Agreement for that Contribution or granted to that entity under this Agreement for that Contribution or
Work shall terminate as of the date such litigation is filed. Work shall terminate as of the date such litigation is filed.
4. You represent that You are legally entitled to grant the above ## 4. You represent that You are legally entitled to grant the above
license. If You are an individual, and if Your employer(s) has rights to intellectual property license. If You are an individual, and if Your employer(s) has rights to intellectual property
that you create that includes Your Contributions, you represent that you create that includes Your Contributions, you represent
that You have received permission to make Contributions on behalf that You have received permission to make Contributions on behalf
of that employer, or that Your employer has waived such rights for of that employer, or that Your employer has waived such rights for
your Contributions to Grafana Labs. If You are a Corporation, any individual who makes a contribution from an account associated with You will be considered authorized to Contribute on Your behalf. your Contributions to Grafana Labs. If You are a Corporation, any individual who makes a contribution from an account associated with You will be considered authorized to Contribute on Your behalf.
5. You represent that each of Your Contributions is Your original ## 5. You represent that each of Your Contributions is Your original
creation (see section 7 for submissions on behalf of others). creation (see section 7 for submissions on behalf of others).
6. You are not expected to provide support for Your Contributions, ## 6. You are not expected to provide support for Your Contributions,
except to the extent You desire to provide support. You may provide except to the extent You desire to provide support. You may provide
support for free, for a fee, or not at all. Unless required by support for free, for a fee, or not at all. Unless required by
applicable law or agreed to in writing, You provide Your applicable law or agreed to in writing, You provide Your
@ -89,7 +87,7 @@ You accept and agree to the following terms and conditions for Your
OF ANY KIND, either express or implied, including, without OF ANY KIND, either express or implied, including, without
limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT,
MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
7. Should You wish to submit work that is not Your original creation, ## 7. Should You wish to submit work that is not Your original creation,
You may submit it to Grafana Labs separately from any You may submit it to Grafana Labs separately from any
Contribution, identifying the complete details of its source and Contribution, identifying the complete details of its source and
of any license or other restriction (including, but not limited of any license or other restriction (including, but not limited