From 2e85f9325a797977eea9dfea0a925775ddd211d9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Feb 2021 12:49:00 +0100 Subject: Merging upstream version 1.29.0. Signed-off-by: Daniel Baumann --- REDISTRIBUTED.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'REDISTRIBUTED.md') diff --git a/REDISTRIBUTED.md b/REDISTRIBUTED.md index 24c6d6c62..fb256b5fc 100644 --- a/REDISTRIBUTED.md +++ b/REDISTRIBUTED.md @@ -1,9 +1,14 @@ + + # Redistributed software Netdata copyright info: Copyright 2016-2018, Costa Tsaousis. Copyright 2018, Netdata Inc. - Released under [GPL v3 or later](LICENSE). + Released under [GPL v3 or later](https://raw.githubusercontent.com/netdata/netdata/master/LICENSE). Netdata uses SPDX license tags to identify the license for its files. Individual licenses referenced in the tags are available on the [SPDX project site](http://spdx.org/licenses/). @@ -156,7 +161,7 @@ connectivity is not available. Copyright (c) 2014 Lucas Garron [MIT License](https://github.com/lgarron/clipboard-polyfill/blob/master/LICENSE.md) -- [Utilities for writing code that runs on Python 2 and 3](collectors/python.d.plugin/python_modules/urllib3/packages/six.py) +- [Utilities for writing code that runs on Python 2 and 3](https://raw.githubusercontent.com/netdata/netdata/master/collectors/python.d.plugin/python_modules/urllib3/packages/six.py) Copyright (c) 2010-2015 Benjamin Peterson [MIT License](https://github.com/benjaminp/six/blob/master/LICENSE) @@ -171,4 +176,8 @@ connectivity is not available. Copyright 2014, 2015, 2016 Ori Livneh [ori@wikimedia.org](mailto:ori@wikimedia.org) [Apache-2.0](http://www.apache.org/licenses/LICENSE-2.0) +- [filelock](https://github.com/benediktschmitt/py-filelock) + + Copyright 2015, Benedikt Schmitt [Unlicense License](https://unlicense.org/) + [![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%2FREDISTRIBUTED&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)](<>) -- cgit v1.2.3