Merging upstream version 1.17.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 42 insertions, 42 deletions

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2b4e0d164..35070e49d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,60 +2,60 @@
 # This way we prevent modifications which will be overwriten by automation.
 
 # Global (default) code owner
-* @ktsaou @cakrit
+* @ktsaou @cakrit @cosmix
 
 # Ownership by directory structure
-.travis/ @paulkatsoulakis @cakrit
-.github/ @paulkatsoulakis @cakrit
+.travis/ @cakrit @cosmix
+.github/ @cakrit @cosmix
 backends/ @thiagoftsm @vlvkobal
 backends/graphite/ @thiagoftsm @vlvkobal
 backends/json/ @thiagoftsm @vlvkobal
 backends/opentsdb/ @thiagoftsm @vlvkobal
-backends/prometheus/ @vlvkobal @paulkatsoulakis @thiagoftsm
-build/ @paulkatsoulakis @cakrit
-collectors/ @vlvkobal @mfundul @cakrit
-collectors/charts.d.plugin/ @paulkatsoulakis @cakrit
-collectors/freebsd.plugin/ @vlvkobal @thiagoftsm @cakrit
-collectors/macos.plugin/ @vlvkobal @thiagoftsm @cakrit
-collectors/node.d.plugin/ @VLegakis @cakrit
-collectors/node.d.plugin/fronius/ @ccremer @cakrit
-collectors/node.d.plugin/snmp/ @VLegakis @cakrit
-collectors/node.d.plugin/stiebeleltron/ @ccremer @cakrit
+backends/prometheus/ @vlvkobal @thiagoftsm
+build/ @cakrit @cosmix
+collectors/ @vlvkobal @mfundul @cakrit @cosmix
+collectors/charts.d.plugin/ @cakrit @cosmix
+collectors/freebsd.plugin/ @vlvkobal @thiagoftsm @cakrit @cosmix
+collectors/macos.plugin/ @vlvkobal @thiagoftsm @cakrit @cosmix
+collectors/node.d.plugin/ @VLegakis @cakrit @cosmix
+collectors/node.d.plugin/fronius/ @ccremer @cakrit @cosmix
+collectors/node.d.plugin/snmp/ @VLegakis @cakrit @cosmix
+collectors/node.d.plugin/stiebeleltron/ @ccremer @cakrit @cosmix
 collectors/python.d.plugin/ @ilyam8
-collectors/cups.plugin/ @simonnagl @vlvkobal @thiagoftsm @cakrit
-daemon/ @thiagoftsm @mfundul @cakrit
-database/ @mfundul @thiagoftsm @cakrit
-docs/ @cakrit @joelhans
-health/ @thiagoftsm @vlvkobal @cakrit
-health/health.d/ @thiagoftsm @vlvkobal @cakrit
-health/notifications/ @Ferroin @thiagoftsm @cakrit
-libnetdata/ @thiagofsm @mfundul @cakrit
-packaging/ @paulkatsoulakis @cakrit
-packaging/installer/ @paulkatsoulakis @cakrit
-packaging/makeself/ @paulkatsoulakis @cakrit
-registry/ @VLegakis @cakrit
-streaming/ @thiagoftsm @vlvkobal @cakrit
-web/ @thiagoftsm @mfundul @vlvkobal @cakrit
-web/gui/ @VLegakis @cakrit
+collectors/cups.plugin/ @simonnagl @vlvkobal @thiagoftsm @cakrit @cosmix
+daemon/ @thiagoftsm @mfundul @cakrit @cosmix
+database/ @mfundul @thiagoftsm @cakrit @cosmix
+docs/ @cakrit @cosmix @joelhans
+health/ @thiagoftsm @vlvkobal @cakrit @cosmix
+health/health.d/ @thiagoftsm @vlvkobal @cakrit @cosmix
+health/notifications/ @Ferroin @thiagoftsm @cakrit @cosmix
+libnetdata/ @thiagofsm @mfundul @cakrit @cosmix
+packaging/ @cakrit @cosmix
+packaging/installer/ @cakrit @cosmix
+packaging/makeself/ @cakrit @cosmix
+registry/ @VLegakis @cakrit @cosmix
+streaming/ @thiagoftsm @vlvkobal @cakrit @cosmix
+web/ @thiagoftsm @mfundul @vlvkobal @cakrit @cosmix
+web/gui/ @VLegakis @cakrit @cosmix
 
 # Ownership by filetype (overwrites ownership by directory)
-*.md @cakrit @joelhans
-*.am @paulkatsoulakis
+*.md @cakrit @cosmix @joelhans
+*.am @cakrit @cosmix
 
 # Ownership of specific files
-.gitignore @paulkatsoulakis @cakrit
-.travis.yml @paulkatsoulakis
-.lgtm.yml @paulkatsoulakis
-.eslintrc @paulkatsoulakis
-.eslintignore @paulkatsoulakis
-.csslintrc @paulkatsoulakis
-.codeclimate.yml @paulkatsoulakis
-.codacy.yml @paulkatsoulakis
-netdata.spec.in @paulkatsoulakis
-netdata-installer.sh @paulkatsoulakis @cakrit
-netlify.toml @cakrit
+.gitignore @cakrit @cosmix
+.travis.yml @cakrit @cosmix
+.lgtm.yml @cakrit @cosmix
+.eslintrc @cakrit @cosmix
+.eslintignore @cakrit @cosmix
+.csslintrc @cakrit @cosmix
+.codeclimate.yml @cakrit @cosmix
+.codacy.yml @cakrit @cosmix
+netdata.spec.in @cakrit @cosmix
+netdata-installer.sh @cakrit @cosmix
+netlify.toml @cakrit @cosmix
 package.json @VLegakis
 packaging/version @netdatabot
 
-LICENSE.md @cakrit @joelhans
+LICENSE.md @cakrit @cosmix @joelhans
 CHANGELOG.md @netdatabot