Code

collectd.git
7 years agoceph plugin: Make cut_suffix void, change var names
Aleksei Zakharov [Thu, 19 Oct 2017 07:25:34 +0000 (07:25 +0000)]
ceph plugin: Make cut_suffix void, change var names

7 years agoAdd sstrncpy if count_parts>2 but no suffix
Aleksei Zakharov [Thu, 12 Oct 2017 10:43:54 +0000 (10:43 +0000)]
Add sstrncpy if count_parts>2 but no suffix

7 years agoClang-format done
Aleksei Zakharov [Wed, 11 Oct 2017 17:26:24 +0000 (17:26 +0000)]
Clang-format done

7 years agoFix unit test
Aleksei Zakharov [Wed, 11 Oct 2017 17:15:30 +0000 (17:15 +0000)]
Fix unit test

".sum" is not cutted in parse_keys() now.

7 years agoMake node_handler_fetch_data() stateless
Aleksei Zakharov [Fri, 6 Oct 2017 22:38:27 +0000 (22:38 +0000)]
Make node_handler_fetch_data() stateless

This code also works with previous ceph versions now.

7 years agoReplace avgcount_exists with latency_next_metric
Aleksei Zakharov [Thu, 5 Oct 2017 08:27:27 +0000 (11:27 +0300)]
Replace avgcount_exists with latency_next_metric

7 years agoAdd support for ceph version luminous
Aleksei Zakharov [Wed, 4 Oct 2017 08:12:23 +0000 (11:12 +0300)]
Add support for ceph version luminous

This patch is not backward compatible with previous ceph versions.

7 years agocollectd.spec: bzip2 is the default
Ruben Kerkhof [Sat, 30 Sep 2017 12:02:15 +0000 (14:02 +0200)]
collectd.spec: bzip2 is the default

7 years agoMerge branch 'pr/2454'
Florian Forster [Fri, 29 Sep 2017 14:24:47 +0000 (16:24 +0200)]
Merge branch 'pr/2454'

7 years agoprocesses plugin: Format with clang-format.
Florian Forster [Fri, 29 Sep 2017 14:24:31 +0000 (16:24 +0200)]
processes plugin: Format with clang-format.

Also a small manpage formatting tweak.

7 years agoMerge branch 'collectd-5.7'
Florian Forster [Fri, 29 Sep 2017 11:08:25 +0000 (13:08 +0200)]
Merge branch 'collectd-5.7'

7 years agoMerge branch 'collectd-5.6' into collectd-5.7
Florian Forster [Fri, 29 Sep 2017 11:05:26 +0000 (13:05 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7

7 years agouse existing type to publish the data
Wilfried Goesgens [Fri, 29 Sep 2017 10:47:27 +0000 (12:47 +0200)]
use existing type to publish the data

7 years agothere no such command in make make-dist-bz2
Default [Fri, 29 Sep 2017 09:32:47 +0000 (12:32 +0300)]
there no such command in make make-dist-bz2

7 years agocollectd.conf(5): Move towards unifying "string literals".
Florian Forster [Fri, 29 Sep 2017 06:50:19 +0000 (08:50 +0200)]
collectd.conf(5): Move towards unifying "string literals".

7 years agoMerge remote-tracking branch 'github/pr/1707'
Florian Forster [Fri, 29 Sep 2017 06:49:29 +0000 (08:49 +0200)]
Merge remote-tracking branch 'github/pr/1707'

7 years agodbi plugin: Fix additional memory leaks.
Florian Forster [Fri, 29 Sep 2017 06:44:22 +0000 (08:44 +0200)]
dbi plugin: Fix additional memory leaks.

7 years agodbi plugin: Fix memory leak.
Pavel Rochnyack [Thu, 12 May 2016 10:24:00 +0000 (16:24 +0600)]
dbi plugin: Fix memory leak.

Some memory was leaked when shutting down.

This is a partial back-port of 5ee365a.

Signed-off-by: Florian Forster <octo@collectd.org>
7 years agocollectd.conf(5): Move towards unifying "string literals".
Florian Forster [Fri, 29 Sep 2017 06:31:11 +0000 (08:31 +0200)]
collectd.conf(5): Move towards unifying "string literals".

7 years agoMerge remote-tracking branch 'github/pr/1681'
Florian Forster [Fri, 29 Sep 2017 06:29:24 +0000 (08:29 +0200)]
Merge remote-tracking branch 'github/pr/1681'

7 years agocurl_json: Added example configuration for PHP-FPM.
Pavel Rochnyack [Thu, 25 Feb 2016 14:44:02 +0000 (21:44 +0700)]
curl_json: Added example configuration for PHP-FPM.

7 years agocurl_json: Add ability to set custom plugin name in collected data.
Pavel Rochnyack [Thu, 25 Feb 2016 14:31:46 +0000 (21:31 +0700)]
curl_json: Add ability to set custom plugin name in collected data.

7 years agofix indention, revert merge failures
Wilfried Goesgens [Thu, 28 Sep 2017 09:34:42 +0000 (11:34 +0200)]
fix indention, revert merge failures

7 years agoadd documentation
Wilfried Goesgens [Thu, 28 Sep 2017 09:34:26 +0000 (11:34 +0200)]
add documentation

7 years agowrite_redis_plugin: Add document for MaxSetDuration
Tomofumi Hayashi [Thu, 28 Sep 2017 03:57:46 +0000 (12:57 +0900)]
write_redis_plugin: Add document for MaxSetDuration

This change adds description for MaxSetDuration, which is
introduced at #2440.

7 years agoMerge remote-tracking branch 'github/pr/2449'
Florian Forster [Wed, 27 Sep 2017 20:24:21 +0000 (22:24 +0200)]
Merge remote-tracking branch 'github/pr/2449'

7 years agosnmp plugin: Use array instead of cycle in res->errstat check
Pavel Rochnyack [Wed, 27 Sep 2017 12:15:13 +0000 (19:15 +0700)]
snmp plugin: Use array instead of cycle in res->errstat check

7 years agoadd option to collect the count of active memory maps for linux processes
Wilfried Goesgens [Wed, 27 Sep 2017 14:52:12 +0000 (16:52 +0200)]
add option to collect the count of active memory maps for linux processes

7 years agoMerge remote-tracking branch 'github/pr/2452'
Florian Forster [Wed, 27 Sep 2017 14:37:16 +0000 (16:37 +0200)]
Merge remote-tracking branch 'github/pr/2452'

7 years agoMerge remote-tracking branch 'github/pr/2437'
Florian Forster [Wed, 27 Sep 2017 10:31:37 +0000 (12:31 +0200)]
Merge remote-tracking branch 'github/pr/2437'

7 years agoMerge remote-tracking branch 'github/pr/2034'
Florian Forster [Wed, 27 Sep 2017 09:37:57 +0000 (11:37 +0200)]
Merge remote-tracking branch 'github/pr/2034'

7 years agoUpdating the varnish plugin
Denes Matetelki [Fri, 22 Sep 2017 15:25:04 +0000 (17:25 +0200)]
Updating the varnish plugin

7 years agosrc/utils_match.c: Reset UTILS_MATCH_CF_GAUGE_INC matches to zero (was: NaN)
Florian Forster [Wed, 27 Sep 2017 09:08:50 +0000 (11:08 +0200)]
src/utils_match.c: Reset UTILS_MATCH_CF_GAUGE_INC matches to zero (was: NaN)

Fixes: #2448
7 years agoMerge remote-tracking branch 'github/pr/2451' into collectd-5.6
Florian Forster [Wed, 27 Sep 2017 08:23:40 +0000 (10:23 +0200)]
Merge remote-tracking branch 'github/pr/2451' into collectd-5.6

7 years agoMerge remote-tracking branch 'github/pr/2388'
Florian Forster [Wed, 27 Sep 2017 06:23:51 +0000 (08:23 +0200)]
Merge remote-tracking branch 'github/pr/2388'

7 years agosnmp plugin: Style fix
Pavel Rochnyack [Tue, 26 Sep 2017 15:30:52 +0000 (22:30 +0700)]
snmp plugin: Style fix

Issue: #2291
Signed-off-by: Florian Forster <octo@collectd.org>
7 years agosnmp plugin: Fix double free of request PDU
Pavel Rochnyack [Wed, 31 May 2017 16:27:13 +0000 (23:27 +0700)]
snmp plugin: Fix double free of request PDU

snmp_sess_synch_response() always frees request PDU, in both case of request
error and success. If error condition occurs inside of `while (status == 0)`
loop, double free of `req` happens.

Issue: #2291
Signed-off-by: Florian Forster <octo@collectd.org>
7 years agoemail, exec and unixsock plugins: Use _SC_GETPW_R_SIZE_MAX.
Florian Forster [Wed, 27 Sep 2017 06:07:10 +0000 (08:07 +0200)]
email, exec and unixsock plugins: Use _SC_GETPW_R_SIZE_MAX.

Fixes: #2208
7 years agoProper return value from 'swrite()' when connection has been closed
Pavel Rochnyack [Mon, 31 Jul 2017 05:21:24 +0000 (12:21 +0700)]
Proper return value from 'swrite()' when connection has been closed

According to POSIX, errno is set only if 'recv()' returns -1.
When connection has been closed, 'recv()' returns 0 and errno left untouched.
For functions which check errno value after 'swrite()', errno now is set to ECONNRESET,
so they produce correct message 'Connection reset by peer'.

7 years agomemcached: Style fix
Pavel Rochnyack [Tue, 26 Sep 2017 19:41:18 +0000 (02:41 +0700)]
memcached: Style fix

7 years agosnmp plugin: Reworked/fixed res->errstat check
Pavel Rochnyack [Tue, 26 Sep 2017 19:01:14 +0000 (02:01 +0700)]
snmp plugin: Reworked/fixed res->errstat check

7 years agosnmp plugin: Added res->errstat check
Pavel Rochnyack [Thu, 1 Jun 2017 07:39:24 +0000 (14:39 +0700)]
snmp plugin: Added res->errstat check

Collectd does not check for `res->errstat` value after
`snmp_sess_synch_response()` call. In case of error, there is no any data in
`res->variables` actually, but variables are tried to be processed as usual.
Suffix calculation will fail, so all subtrees will be marked as failed, not
only one subtree which caused an error.

The csnmp_instance_list_add() call will fail too, and, as result,
`csnmp_read_table` will finish it's work without any data submission.

The log message like
"snmp plugin: host HOSTNAME: csnmp_instance_list_add failed",
which is put into logs in this case, also has no enough diagnostic data.

Added code to proper check for `res->errstat` and to try to get available data.

Issue: #2291

7 years agoMerge remote-tracking branch 'github/pr/2446'
Florian Forster [Tue, 26 Sep 2017 17:47:01 +0000 (19:47 +0200)]
Merge remote-tracking branch 'github/pr/2446'

7 years agomsr-index: include GPLv2 header
Vincent Brillault [Tue, 26 Sep 2017 17:34:03 +0000 (19:34 +0200)]
msr-index: include GPLv2 header

7 years agomemcached: Report connections rate
Pavel Rochnyack [Sun, 30 Jul 2017 11:10:00 +0000 (18:10 +0700)]
memcached: Report connections rate

Signed-off-by: Florian Forster <octo@collectd.org>
7 years agoMerge remote-tracking branch 'github/pr/1979'
Florian Forster [Tue, 26 Sep 2017 09:57:34 +0000 (11:57 +0200)]
Merge remote-tracking branch 'github/pr/1979'

7 years agoturbostat: better support for mutli packages
Vincent Brillault [Mon, 25 Sep 2017 19:35:50 +0000 (21:35 +0200)]
turbostat: better support for mutli packages

If multiple packages are defined, support non-logical core enumeration
by prefixing each core id by its package id

7 years agoturbostat: import msr-index header from linux
Vincent Brillault [Mon, 25 Sep 2017 19:21:45 +0000 (21:21 +0200)]
turbostat: import msr-index header from linux

Since Linux 4.12, the kernel does not expose msr-index.h to the userland
anymore. This commit pulls and hardcode the required definitions.

7 years agoMerge remote-tracking branch 'github/pr/2440'
Florian Forster [Mon, 25 Sep 2017 18:58:35 +0000 (20:58 +0200)]
Merge remote-tracking branch 'github/pr/2440'

7 years agoAdd max_set_duration to set duration for value
Tomofumi Hayashi [Thu, 21 Sep 2017 09:10:30 +0000 (18:10 +0900)]
Add max_set_duration to set duration for value

This change introduces max_set_duration, the duration for the value
as max_set_size. max_set_size can keep the db size, however, sometime
max_set_size allows to contain old data. max_set_duration can keep
the latest data.

7 years agouptime plugin: don't cache boot time and simplify Linux code
Marcin Jurkowski [Tue, 11 Jul 2017 13:00:25 +0000 (15:00 +0200)]
uptime plugin: don't cache boot time and simplify Linux code

Caching boottime on startup yields incorrect uptime values if system
date changes after the daemon is started.
This is almost certain to happen on embedded systems without RTC, where
clock is set from NTP server at some point after boot process.

On Linux, we can retrieve uptime directly by either reading /proc/uptime
(it's sufficient to read a few bytes) or calling sysinfo() function.
Use the latter since it's the most efficient way in speed, memory
requirements and code simplicity terms.

7 years agoMerge remote-tracking branch 'github/pr/2442'
Florian Forster [Mon, 25 Sep 2017 07:36:23 +0000 (09:36 +0200)]
Merge remote-tracking branch 'github/pr/2442'

7 years agozfs_arc plugin: Avoid resetting global variables from init().
Florian Forster [Mon, 25 Sep 2017 07:28:34 +0000 (09:28 +0200)]
zfs_arc plugin: Avoid resetting global variables from init().

Fixes: #973
7 years agozfs_arc: derive hit/miss stats for ratio calculations
Richard Kojedzinszky [Sat, 14 Jan 2017 08:41:12 +0000 (09:41 +0100)]
zfs_arc: derive hit/miss stats for ratio calculations

7 years agotail plugin: Allow to set "bucket" metrics type
Pavel Rochnyack [Sun, 24 Sep 2017 14:00:53 +0000 (21:00 +0700)]
tail plugin: Allow to set "bucket" metrics type

When several distributions needs to be calculated in one 'tail' instance,
all their metrics will be reported as single 'bucket' type with the same plugin instance value.
That is confusing and this patch allows to split these metrics to their own types.

7 years agoMerge remote-tracking branch 'github/pr/2439'
Florian Forster [Sat, 23 Sep 2017 20:14:18 +0000 (22:14 +0200)]
Merge remote-tracking branch 'github/pr/2439'

7 years agocpu plugin: add new options to the default configuration file.
Xavier G [Sat, 23 Sep 2017 19:57:13 +0000 (21:57 +0200)]
cpu plugin: add new options to the default configuration file.

7 years agocpu plugin: adjust numfields conditions in cpu_read().
Xavier G [Sat, 23 Sep 2017 19:27:20 +0000 (21:27 +0200)]
cpu plugin: adjust numfields conditions in cpu_read().

7 years agocpu plugin: adjust coding style (variable declaration).
Xavier G [Sat, 23 Sep 2017 17:38:30 +0000 (19:38 +0200)]
cpu plugin: adjust coding style (variable declaration).

7 years agocpu plugin: update documentation.
Xavier G [Sat, 23 Sep 2017 16:58:51 +0000 (18:58 +0200)]
cpu plugin: update documentation.

7 years agocpu plugin: subtract guest states from user/nice.
Xavier G [Sat, 23 Sep 2017 16:34:11 +0000 (18:34 +0200)]
cpu plugin: subtract guest states from user/nice.

7 years agoMerge pull request #2441 from zerkms/ISSUE-2433
Florian Forster [Sat, 23 Sep 2017 06:03:03 +0000 (08:03 +0200)]
Merge pull request #2441 from zerkms/ISSUE-2433

Added `ReportIO` option to the `swap` plugin

7 years agoswap plugin: Added `ReportIO` option
Ivan Kurnosov [Sat, 23 Sep 2017 05:32:14 +0000 (17:32 +1200)]
swap plugin: Added `ReportIO` option

lxc/lxd containers at the moment cannot properly report the swap io (the corresponding /proc/vmstat are not virtualized), so added an option to disable that reporting.
Enabled by default.

Closes: #2433
7 years agoMerge remote-tracking branch 'github/pr/2377'
Florian Forster [Fri, 22 Sep 2017 06:55:18 +0000 (08:55 +0200)]
Merge remote-tracking branch 'github/pr/2377'

7 years agoFilecount plugin: Code style changes, clang-format
Pavel Rochnyack [Fri, 22 Sep 2017 06:40:28 +0000 (13:40 +0700)]
Filecount plugin: Code style changes, clang-format

7 years agoFilecount plugin: Custom values for reported plugin, type and type instance
Pavel Rochnyack [Sun, 9 Oct 2016 14:28:52 +0000 (20:28 +0600)]
Filecount plugin: Custom values for reported plugin, type and type instance

* Allow to set plugin name;
* Allow to set empty plugin instance;
* Allow to set metric types: Added 'FilesSizeType' and 'FilesCountType' options;
* Allow to disable metric reporting;
* Allow to set metrics type instance

7 years agoMerge remote-tracking branch 'github/pr/2434'
Florian Forster [Thu, 21 Sep 2017 20:00:14 +0000 (22:00 +0200)]
Merge remote-tracking branch 'github/pr/2434'

7 years agoMerge remote-tracking branch 'github/pr/2435'
Florian Forster [Thu, 21 Sep 2017 17:59:46 +0000 (19:59 +0200)]
Merge remote-tracking branch 'github/pr/2435'

7 years agoMerge branch 'collectd-5.7'
Florian Forster [Thu, 21 Sep 2017 15:26:23 +0000 (17:26 +0200)]
Merge branch 'collectd-5.7'

7 years agoMerge branch 'collectd-5.6' into collectd-5.7
Florian Forster [Thu, 21 Sep 2017 15:22:39 +0000 (17:22 +0200)]
Merge branch 'collectd-5.6' into collectd-5.7

7 years agosrc/daemon/collectd.c: Fix implementation of the -B option.
Florian Forster [Thu, 21 Sep 2017 15:18:05 +0000 (17:18 +0200)]
src/daemon/collectd.c: Fix implementation of the -B option.

Also add a manual page entry.

Issue: #2421
Pull-Request: #2422

7 years agoMerge remote-tracking branch 'github/pr/2422'
Florian Forster [Thu, 21 Sep 2017 15:10:46 +0000 (17:10 +0200)]
Merge remote-tracking branch 'github/pr/2422'

Fixes: #2421
7 years agotable: Allow custom plugin name to be reported
Pavel Rochnyack [Thu, 21 Sep 2017 06:24:14 +0000 (13:24 +0700)]
table: Allow custom plugin name to be reported

7 years agoAdd daemon option to avoid making BaseDir
Nathaniel Wesley Filardo [Wed, 6 Sep 2017 17:56:40 +0000 (13:56 -0400)]
Add daemon option to avoid making BaseDir

One possible implementation of collectd/collectd#2421

7 years agoopenvpn: Changes after review, clang-formatting
Pavel Rochnyack [Thu, 21 Sep 2017 04:17:32 +0000 (11:17 +0700)]
openvpn: Changes after review, clang-formatting

7 years agoopenvpn: reworked status file parser
Pavel Rochnyack [Sat, 8 Jul 2017 18:04:05 +0000 (01:04 +0700)]
openvpn: reworked status file parser

 * Added detection of status fields index by parsing 'HEADER' lines.
   This allows to support status files from latest OpenVPN-2.4 and possible from future versions;
 * Fixed a bug with OpenVPN status file version 3 where delimiter is 'tab' (not space or comma);
 * Status file version detection was moved from configuration callback to read callback;
 * Now 'plugin_register_complex_read()' is used for registering read callback.

Closes: #2128
7 years agocpu plugin: add linux-specific "guest" states.
Xavier G [Wed, 20 Sep 2017 21:28:35 +0000 (23:28 +0200)]
cpu plugin: add linux-specific "guest" states.

7 years agocollectd.conf(5): Document dependencies between mqtt's TLS options better.
Florian Forster [Wed, 20 Sep 2017 20:26:08 +0000 (22:26 +0200)]
collectd.conf(5): Document dependencies between mqtt's TLS options better.

7 years agomqtt plugin: Add support for TLS in Subscriber blocks.
Florian Forster [Wed, 20 Sep 2017 20:20:51 +0000 (22:20 +0200)]
mqtt plugin: Add support for TLS in Subscriber blocks.

Fixes: #2419
7 years agoperl plugin: Improve error message.
Florian Forster [Wed, 20 Sep 2017 17:38:10 +0000 (19:38 +0200)]
perl plugin: Improve error message.

7 years agoMerge remote-tracking branch 'github/pr/2391' into collectd-5.6
Florian Forster [Wed, 20 Sep 2017 17:34:56 +0000 (19:34 +0200)]
Merge remote-tracking branch 'github/pr/2391' into collectd-5.6

7 years agonfs plugin: Fix typo
Christian Bartolomäus [Tue, 19 Sep 2017 07:09:39 +0000 (09:09 +0200)]
nfs plugin: Fix typo

7 years agoMerge remote-tracking branch 'github/pr/2430'
Florian Forster [Tue, 19 Sep 2017 06:20:19 +0000 (08:20 +0200)]
Merge remote-tracking branch 'github/pr/2430'

7 years agoMerge branch 'pr/2431'
Florian Forster [Tue, 19 Sep 2017 06:16:53 +0000 (08:16 +0200)]
Merge branch 'pr/2431'

7 years agouptime plugin: Coding style update.
Florian Forster [Tue, 19 Sep 2017 06:16:42 +0000 (08:16 +0200)]
uptime plugin: Coding style update.

This is only touching the Linux code, though.

7 years agonfs plugin: Changes after review
usev6 [Mon, 18 Sep 2017 18:50:18 +0000 (20:50 +0200)]
nfs plugin: Changes after review

* Avoid negated config options (s/IgnoreV/ReportV/)
* Use _Bool instead of int
* Handle multiple occurences of config option correctly

7 years agoMerge branch 'collectd-5.7'
Florian Forster [Mon, 18 Sep 2017 14:15:23 +0000 (16:15 +0200)]
Merge branch 'collectd-5.7'

7 years agoReimplemented `uptime` plugin to read from `/proc/uptime`
Ivan Kurnosov [Mon, 18 Sep 2017 08:17:05 +0000 (20:17 +1200)]
Reimplemented `uptime` plugin to read from `/proc/uptime`

7 years agosynproxy plugin: Re-run clang-format.
Florian Forster [Mon, 18 Sep 2017 08:04:47 +0000 (10:04 +0200)]
synproxy plugin: Re-run clang-format.

7 years agoMerge remote-tracking branch 'github/pr/2381'
Florian Forster [Mon, 18 Sep 2017 08:02:45 +0000 (10:02 +0200)]
Merge remote-tracking branch 'github/pr/2381'

7 years agoMerge pull request #2417 from bluca/dpdk_pkgconfig_backport
Florian Forster [Mon, 18 Sep 2017 06:58:44 +0000 (08:58 +0200)]
Merge pull request #2417 from bluca/dpdk_pkgconfig_backport

configure.ac: dpdk: use pkg-config - 5.7

7 years agoMerge remote-tracking branch 'github/pr/2412'
Florian Forster [Mon, 18 Sep 2017 06:53:01 +0000 (08:53 +0200)]
Merge remote-tracking branch 'github/pr/2412'

7 years agouse generic types in synproxy plugin and code refactoring
Marek Becka [Mon, 31 Jul 2017 11:41:25 +0000 (07:41 -0400)]
use generic types in synproxy plugin and code refactoring

7 years agoFix source path in automake
Marek Becka [Wed, 26 Jul 2017 11:25:16 +0000 (07:25 -0400)]
Fix source path in automake

7 years agoNew plugin: synproxy
Marek Becka [Wed, 26 Jul 2017 10:12:12 +0000 (06:12 -0400)]
New plugin: synproxy

7 years agonfs: Add config options to ignore versions
usev6 [Fri, 15 Sep 2017 21:05:14 +0000 (23:05 +0200)]
nfs: Add config options to ignore versions

7 years agoREADME: NFSv4 is supported nowadays
usev6 [Fri, 15 Sep 2017 21:02:19 +0000 (23:02 +0200)]
README: NFSv4 is supported nowadays

(implemented with commit 64446a66fe)

7 years agocollectd.spec: avoid accidentally picking an ancient/unsupported java version
Marc Fournier [Mon, 4 Sep 2017 09:51:04 +0000 (11:51 +0200)]
collectd.spec: avoid accidentally picking an ancient/unsupported java version

7 years agontpd: Correct loop offset and error calculation
Neil Wilson [Thu, 23 Feb 2017 17:03:34 +0000 (17:03 +0000)]
ntpd: Correct loop offset and error calculation

Stop the scaling calculation dropping the sign of the underlying value

Fixes: #2188
7 years agoMerge remote-tracking branch 'github/pr/2258'
Florian Forster [Wed, 30 Aug 2017 11:34:28 +0000 (13:34 +0200)]
Merge remote-tracking branch 'github/pr/2258'