From cbf70980c060bde02906a8e9de2064459bacc93c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 4 Aug 2019 10:57:13 +0200 Subject: Merging upstream version 1.16.1. Signed-off-by: Daniel Baumann --- CONTRIBUTORS.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'CONTRIBUTORS.md') diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 0565644e8..1cb02caa5 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -28,8 +28,9 @@ The Contributor (*you*) hereby assigns netdata Inc. copyright in his contributions, to be licensed under the same terms as the rest of the code. > *Note: this means we may re-license netdata (your contributions included) -> any way we see fit, without asking your permission. -> Open-source licenses have significant differences and in our attempt to +> any way we see fit, without asking your permission. +> We intend to keep the netdata agent forever FOSS. +> But open-source licenses have significant differences and in our attempt to > help netdata grow we may have to distribute it under a different license. > For example, CNCF, the Cloud Native Computing Foundation, requires netdata > to be licensed under Apache-2.0 for it to be accepted as a member of the @@ -125,5 +126,6 @@ username|name|email (optional) @adherzog|Adam Herzog|adam@adamherzog.com @skrzyp1|Jerzy S.| @akwan|Alan Kwan| +@underhood|Timotej Šiškovič| [![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2FCONTRIBUTORS&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)]() -- cgit v1.2.3