From 1d63948d79ca6f32889656692d6736c9127f2ee1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2019 19:57:47 +0200 Subject: Merging upstream version 1.14.0~rc0. Signed-off-by: Daniel Baumann --- .../python_modules/bases/FrameworkServices/ExecutableService.py | 2 +- .../python_modules/bases/FrameworkServices/LogService.py | 2 +- .../python_modules/bases/FrameworkServices/MySQLService.py | 2 +- .../python_modules/bases/FrameworkServices/SimpleService.py | 2 +- .../python_modules/bases/FrameworkServices/SocketService.py | 2 +- .../python_modules/bases/FrameworkServices/UrlService.py | 2 +- collectors/python.d.plugin/python_modules/bases/charts.py | 2 +- collectors/python.d.plugin/python_modules/bases/collection.py | 2 +- collectors/python.d.plugin/python_modules/bases/loaders.py | 2 +- collectors/python.d.plugin/python_modules/bases/loggers.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'collectors/python.d.plugin/python_modules/bases') diff --git a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/ExecutableService.py b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/ExecutableService.py index 72f9ff714..f63cb7c2f 100644 --- a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/ExecutableService.py +++ b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/ExecutableService.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Description: # Author: Pawel Krupa (paulfantom) -# Author: Ilya Mashchenko (l2isbad) +# Author: Ilya Mashchenko (ilyam8) # SPDX-License-Identifier: GPL-3.0-or-later import os diff --git a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/LogService.py b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/LogService.py index 82c8d7d95..a55e33f52 100644 --- a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/LogService.py +++ b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/LogService.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Description: # Author: Pawel Krupa (paulfantom) -# Author: Ilya Mashchenko (l2isbad) +# Author: Ilya Mashchenko (ilyam8) # SPDX-License-Identifier: GPL-3.0-or-later from glob import glob diff --git a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/MySQLService.py b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/MySQLService.py index a09041ca4..354d09ad8 100644 --- a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/MySQLService.py +++ b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/MySQLService.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Description: -# Author: Ilya Mashchenko (l2isbad) +# Author: Ilya Mashchenko (ilyam8) # SPDX-License-Identifier: GPL-3.0-or-later from sys import exc_info diff --git a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/SimpleService.py b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/SimpleService.py index 4c1d6ba64..088bf119e 100644 --- a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/SimpleService.py +++ b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/SimpleService.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Description: # Author: Pawel Krupa (paulfantom) -# Author: Ilya Mashchenko (l2isbad) +# Author: Ilya Mashchenko (ilyam8) # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/SocketService.py b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/SocketService.py index f5e6380b8..c8b2724da 100644 --- a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/SocketService.py +++ b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/SocketService.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Description: # Author: Pawel Krupa (paulfantom) -# Author: Ilya Mashchenko (l2isbad) +# Author: Ilya Mashchenko (ilyam8) # SPDX-License-Identifier: GPL-3.0-or-later import socket diff --git a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/UrlService.py b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/UrlService.py index 011efff9e..1e87c9948 100644 --- a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/UrlService.py +++ b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/UrlService.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Description: # Author: Pawel Krupa (paulfantom) -# Author: Ilya Mashchenko (l2isbad) +# Author: Ilya Mashchenko (ilyam8) # SPDX-License-Identifier: GPL-3.0-or-later import urllib3 diff --git a/collectors/python.d.plugin/python_modules/bases/charts.py b/collectors/python.d.plugin/python_modules/bases/charts.py index 0a0719056..008ebe24e 100644 --- a/collectors/python.d.plugin/python_modules/bases/charts.py +++ b/collectors/python.d.plugin/python_modules/bases/charts.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Description: -# Author: Ilya Mashchenko (l2isbad) +# Author: Ilya Mashchenko (ilyam8) # SPDX-License-Identifier: GPL-3.0-or-later from bases.collection import safe_print diff --git a/collectors/python.d.plugin/python_modules/bases/collection.py b/collectors/python.d.plugin/python_modules/bases/collection.py index 7a3390bc6..4c25aafd5 100644 --- a/collectors/python.d.plugin/python_modules/bases/collection.py +++ b/collectors/python.d.plugin/python_modules/bases/collection.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Description: -# Author: Ilya Mashchenko (l2isbad) +# Author: Ilya Mashchenko (ilyam8) # SPDX-License-Identifier: GPL-3.0-or-later import os diff --git a/collectors/python.d.plugin/python_modules/bases/loaders.py b/collectors/python.d.plugin/python_modules/bases/loaders.py index d8b2ec815..095f3a3b1 100644 --- a/collectors/python.d.plugin/python_modules/bases/loaders.py +++ b/collectors/python.d.plugin/python_modules/bases/loaders.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Description: -# Author: Ilya Mashchenko (l2isbad) +# Author: Ilya Mashchenko (ilyam8) # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/collectors/python.d.plugin/python_modules/bases/loggers.py b/collectors/python.d.plugin/python_modules/bases/loggers.py index aaf974952..9bf2e086b 100644 --- a/collectors/python.d.plugin/python_modules/bases/loggers.py +++ b/collectors/python.d.plugin/python_modules/bases/loggers.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Description: -# Author: Ilya Mashchenko (l2isbad) +# Author: Ilya Mashchenko (ilyam8) # SPDX-License-Identifier: GPL-3.0-or-later import logging -- cgit v1.2.3