Skip to content

Commit 7f15e89

Browse files
authoredSep 3, 2020
chore: Switch to the MPL 2.0 license (vectordotdev#3654)
1 parent 7e2ea29 commit 7f15e89

File tree

2 files changed

+371
-215
lines changed

2 files changed

+371
-215
lines changed
 

‎CONTRIBUTING.md

+9-14
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ expanding into more specifics.
99

1010
1. [Assumptions](#assumptions)
1111
1. [Your First Contribution](#your-first-contribution)
12+
1. [New sources, sinks, and transforms](#new-sources-sinks-and-transforms)
1213
1. [Change Control](#change-control)
1314
1. [Git Branches](#git-branches)
1415
1. [Git Commits](#git-commits)
@@ -31,6 +32,7 @@ expanding into more specifics.
3132
1. [Dependencies](#dependencies)
3233
1. [Guidelines](#guidelines)
3334
1. [Sink Healthchecks](#sink-healthchecks)
35+
1. [Metric naming convention](#metric-naming-convention)
3436
1. [Testing](#testing)
3537
1. [Sample Logs](#sample-logs)
3638
1. [Tips and Tricks](#tips-and-tricks)
@@ -817,10 +819,10 @@ To protect all users of Vector, the following legal requirements are made.
817819
### DCO
818820

819821
Vector requires all contributors to agree to the DCO. DCO stands for Developer
820-
Certificate of Origin and is maintained by the [Linux
821-
Foundation](https://www.linuxfoundation.org). It is an attestation attached to
822-
every commit made by every developer. It ensures that all committed code
823-
adheres to the [Vector license](LICENSE.md) (Apache 2.0).
822+
Certificate of Origin and is maintained by the
823+
[Linux Foundation](https://www.linuxfoundation.org). It is an attestation
824+
attached to every commit made by every developer. It ensures that all committed
825+
code adheres to the [Vector license](LICENSE.md).
824826

825827
#### Trivial changes
826828

@@ -829,16 +831,9 @@ Trivial changes, such as spelling fixes, do not need to be signed.
829831
### Granted rights and copyright assignment
830832

831833
It is important to note that the DCO is not a license. The license of the
832-
project – in our case the Apache License – is the license under which the
833-
contribution is made. However, the DCO in conjunction with the Apache License
834-
may be considered an alternate CLA.
835-
836-
The existence of section 5 of the Apache License is proof that the Apache
837-
License is intended to be usable without CLAs. Users need for the code to be
838-
open-source, with all the legal rights that imply, but it is the open source
839-
license that provides this. The Apache License provides very generous
840-
copyright permissions from contributors, and contributors explicitly grant
841-
patent licenses as well. These rights are granted to everyone.
834+
project is the license under which the contribution is made. However, the DCO
835+
in conjunction with the Vector License may be considered an alternate
836+
Contributor License Agreement (CLA).
842837

843838
## FAQ
844839

0 commit comments

Comments
 (0)