Code

collectd.git
7 years agoAuto-Merge pull request #2369 from marekbecka/nfs42
collectd bot [Sun, 29 Oct 2017 15:12:22 +0000 (16:12 +0100)]
Auto-Merge pull request #2369 from marekbecka/nfs42

Automatically merged due to "Automerge" label

7 years agocontrib/format.sh src/nfs.c
Florian Forster [Sun, 29 Oct 2017 14:34:21 +0000 (15:34 +0100)]
contrib/format.sh src/nfs.c

7 years agoAdd new NFS 4.2 counters on Linux
Marek Becka [Tue, 18 Jul 2017 12:17:43 +0000 (08:17 -0400)]
Add new NFS 4.2 counters on Linux

7 years agocontrib/format.sh: Fix bashisms.
Florian Forster [Sun, 29 Oct 2017 09:24:02 +0000 (10:24 +0100)]
contrib/format.sh: Fix bashisms.

7 years agoAuto-Merge pull request #2507 from rpv-tomsk/issue-2506
collectd bot [Thu, 26 Oct 2017 06:09:54 +0000 (08:09 +0200)]
Auto-Merge pull request #2507 from rpv-tomsk/issue-2506

Automatically merged due to "Automerge" label

7 years agoFix hostname_g initialization from gethostname()
Pavel Rochnyack [Thu, 26 Oct 2017 05:17:49 +0000 (12:17 +0700)]
Fix hostname_g initialization from gethostname()

Closes: #2506
7 years agoAuto-Merge pull request #2505 from jiriproX/dpdkstat_enh
collectd bot [Wed, 25 Oct 2017 18:09:09 +0000 (20:09 +0200)]
Auto-Merge pull request #2505 from jiriproX/dpdkstat_enh

Automatically merged due to "Automerge" label

7 years agoOne more review comment
Jiri Prokes [Wed, 25 Oct 2017 16:59:36 +0000 (09:59 -0700)]
One more review comment

Signed-off-by: Jiri Prokes <jirix.x.prokes@intel.com>
7 years agoIncorporation of review commnets
Jiri Prokes [Wed, 25 Oct 2017 12:51:18 +0000 (05:51 -0700)]
Incorporation of review commnets

Signed-off-by: Jiri Prokes <jirix.x.prokes@intel.com>
7 years agoAuto-Merge pull request #2474 from octo/maintainer-guide
collectd bot [Wed, 25 Oct 2017 07:09:40 +0000 (09:09 +0200)]
Auto-Merge pull request #2474 from octo/maintainer-guide

Automatically merged due to "Automerge" label

7 years agodocs/maintainer_guide.md: First draft.
Florian Forster [Wed, 25 Oct 2017 06:51:11 +0000 (08:51 +0200)]
docs/maintainer_guide.md: First draft.

7 years agoMerge pull request #2468 from octo/ff/memcached
Pavel Rochnyak [Tue, 24 Oct 2017 16:18:23 +0000 (23:18 +0700)]
Merge pull request #2468 from octo/ff/memcached

memcached plugin: Report "listen_disabled_num" as "total_events".

7 years agoFormat correction.
Jiri Prokes [Tue, 24 Oct 2017 14:32:39 +0000 (07:32 -0700)]
Format correction.

Signed-off-by: Jiri Prokes <jirix.x.prokes@intel.com>
7 years agoCorrection of tracing from child process
Jiri Prokes [Tue, 24 Oct 2017 13:17:16 +0000 (06:17 -0700)]
Correction of tracing from child process
- There was read 16kb from pipe but only less then 1kb was traced.
  Rest of trace data was lost.
Added support for two EAL parameters:
  LogLevel - optional EAL paramenter which enable debug traces from rte libs
             If parameter is not used default trace level = 7 (INFO) is used
             LogLevel "8" - (DEBUG) can be set to collectd.conf into dpdkstat
             EAL section
  RteDriverLibPath - optional EAL parameter which enable loading of shared
                     pmd driver libs. Param value can be full path to single
                     pmd diriver lib or directory where pmd driver libs are
                     located. E.g.: "/usr/lib/dpdk-pmd/librte_pmd_i40e.so"
                                 or "/usr/lib/dpdk-pmd"

Signed-off-by: Jiri Prokes <jirix.x.prokes@intel.com>
7 years agoCONTRIBUTING.md: Update formatting requirements.
Florian Forster [Tue, 24 Oct 2017 06:37:04 +0000 (08:37 +0200)]
CONTRIBUTING.md: Update formatting requirements.

Also point to contrib/format.sh as the source of truth.

7 years agomemcached plugin: Report "listen_disabled_num" as type "total_events".
Florian Forster [Tue, 24 Oct 2017 06:30:58 +0000 (08:30 +0200)]
memcached plugin: Report "listen_disabled_num" as type "total_events".

7 years agomemcached plugin: Report "listen_disabled_num" as "operations".
Florian Forster [Fri, 6 Oct 2017 06:36:39 +0000 (08:36 +0200)]
memcached plugin: Report "listen_disabled_num" as "operations".

Fixes: #2386
7 years agocontrib/format.sh: Add script for formatting files using a remote clang-format.
Florian Forster [Mon, 23 Oct 2017 15:03:10 +0000 (17:03 +0200)]
contrib/format.sh: Add script for formatting files using a remote clang-format.

7 years agolvm plugin: Fix compilation issues
Pavel Rochnyack [Mon, 23 Oct 2017 14:00:52 +0000 (21:00 +0700)]
lvm plugin: Fix compilation issues

7 years agoMerge remote-tracking branch 'github/pr/2492'
Florian Forster [Mon, 23 Oct 2017 13:20:40 +0000 (15:20 +0200)]
Merge remote-tracking branch 'github/pr/2492'

7 years agosrc/daemon/plugin.c: Fix some coding style.
Florian Forster [Wed, 18 Oct 2017 18:59:49 +0000 (20:59 +0200)]
src/daemon/plugin.c: Fix some coding style.

Primarily to test the clang-format bot.

7 years agolvm update: Check for the CAP_SYS_ADMIN capability.
Florian Forster [Sun, 22 Oct 2017 17:59:19 +0000 (19:59 +0200)]
lvm update: Check for the CAP_SYS_ADMIN capability.

Fixes: #2426
7 years agoMerge remote-tracking branch 'github/pr/2464'
Florian Forster [Sun, 22 Oct 2017 08:12:16 +0000 (10:12 +0200)]
Merge remote-tracking branch 'github/pr/2464'

7 years agoclang-format src/postgresql.c
Florian Forster [Sat, 21 Oct 2017 19:37:21 +0000 (21:37 +0200)]
clang-format src/postgresql.c

7 years agoUpdate postgresql.c
daniacs [Fri, 20 Oct 2017 16:36:12 +0000 (14:36 -0200)]
Update postgresql.c

A simple way collectd to identify itself to pg_stat_activity view.

7 years agoMerge branch 'collectd-5.7'
Pavel Rochnyack [Fri, 20 Oct 2017 14:00:29 +0000 (21:00 +0700)]
Merge branch 'collectd-5.7'

7 years agoMerge branch 'collectd-5.6' into collectd-5.7
Pavel Rochnyack [Fri, 20 Oct 2017 13:54:09 +0000 (20:54 +0700)]
Merge branch 'collectd-5.6' into collectd-5.7

7 years agoMerge pull request #2346 from trenkel/master
Pavel Rochnyak [Fri, 20 Oct 2017 13:15:57 +0000 (20:15 +0700)]
Merge pull request #2346 from trenkel/master

Add CollectdError exception which can be thrown without causing a stacktrace to be logged.

7 years agoFix left ssnprintf in test
rmakulov [Mon, 17 Jul 2017 09:12:45 +0000 (12:12 +0300)]
Fix left ssnprintf in test

7 years agopython plugin: Passed through clang-format
Pavel Rochnyack [Fri, 20 Oct 2017 12:10:48 +0000 (19:10 +0700)]
python plugin: Passed through clang-format

7 years agoMerge pull request #2071 from maryamtahhan/feat_ipmi_analog
Pavel Rochnyak [Fri, 20 Oct 2017 06:34:43 +0000 (13:34 +0700)]
Merge pull request #2071 from maryamtahhan/feat_ipmi_analog

ipmi plugin: add more analog sensors support

7 years agoceph plugin: Move comment to right place
Aleksei Zakharov [Thu, 19 Oct 2017 09:58:30 +0000 (09:58 +0000)]
ceph plugin: Move comment to right place

7 years agoAdd comment about "avgtime" usage
Aleksei Zakharov [Thu, 19 Oct 2017 08:44:28 +0000 (08:44 +0000)]
Add comment about "avgtime" usage

7 years agoFix parse_keys() to use cut_suffixes array
Aleksei Zakharov [Thu, 19 Oct 2017 08:40:28 +0000 (08:40 +0000)]
Fix parse_keys() to use cut_suffixes array

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 agoMerge remote-tracking branch 'github/pr/2467'
Florian Forster [Thu, 19 Oct 2017 07:21:50 +0000 (09:21 +0200)]
Merge remote-tracking branch 'github/pr/2467'

7 years agoclang-format -style=file -i src/daemon/{collectd,configfile,globals}.c
Florian Forster [Thu, 19 Oct 2017 05:26:34 +0000 (07:26 +0200)]
clang-format -style=file -i src/daemon/{collectd,configfile,globals}.c

7 years agoMinor changes to address PR comments.
campbellsean@google.com [Wed, 18 Oct 2017 20:48:50 +0000 (16:48 -0400)]
Minor changes to address PR comments.

7 years agoTidy up formatting with clang-format.
campbellsean@google.com [Wed, 18 Oct 2017 20:39:29 +0000 (16:39 -0400)]
Tidy up formatting with clang-format.

7 years agoMerge remote-tracking branch 'github/pr/2490'
Florian Forster [Wed, 18 Oct 2017 18:54:37 +0000 (20:54 +0200)]
Merge remote-tracking branch 'github/pr/2490'

7 years agorrdtool plugin: Small code cleanup.
Florian Forster [Wed, 18 Oct 2017 13:07:29 +0000 (15:07 +0200)]
rrdtool plugin: Small code cleanup.

Primarily to test the clang-format bot.

7 years agoMerge remote-tracking branch 'github/pr/2488'
Florian Forster [Wed, 18 Oct 2017 18:27:04 +0000 (20:27 +0200)]
Merge remote-tracking branch 'github/pr/2488'

7 years agoclang-format -style=file -i src/snmp.c
Florian Forster [Wed, 18 Oct 2017 18:00:13 +0000 (20:00 +0200)]
clang-format -style=file -i src/snmp.c

7 years agoSet timeout initially to 0 per reviewer's suggestion
Carlos Vicente [Wed, 18 Oct 2017 17:12:05 +0000 (17:12 +0000)]
Set timeout initially to 0 per reviewer's suggestion

7 years agoAdress reviewer's suggestions and add documentation
Carlos Vicente [Wed, 18 Oct 2017 14:21:56 +0000 (14:21 +0000)]
Adress reviewer's suggestions and add documentation

7 years agoMerge remote-tracking branch 'github/pr/2489'
Florian Forster [Wed, 18 Oct 2017 09:17:48 +0000 (11:17 +0200)]
Merge remote-tracking branch 'github/pr/2489'

7 years agoMerge pull request #2485 from rpv-tomsk/processes
Pavel Rochnyak [Wed, 18 Oct 2017 09:02:55 +0000 (16:02 +0700)]
Merge pull request #2485 from rpv-tomsk/processes

processes: Improved documentation

7 years agoprocesses: Improved documentation
Pavel Rochnyack [Sun, 15 Oct 2017 15:33:50 +0000 (22:33 +0700)]
processes: Improved documentation

7 years agosnmp plugin: Use cf_util_get_boolean() for boolean config options.
Florian Forster [Wed, 18 Oct 2017 06:54:53 +0000 (08:54 +0200)]
snmp plugin: Use cf_util_get_boolean() for boolean config options.

7 years agofilecount: Controls whether or not to include only regular files in the count (#2483)
alex2grad [Wed, 18 Oct 2017 06:42:21 +0000 (02:42 -0400)]
filecount: Controls whether or not to include only regular files in the count (#2483)

7 years agoAddress reviewer's suggestions
Carlos Vicente [Tue, 17 Oct 2017 16:39:48 +0000 (16:39 +0000)]
Address reviewer's suggestions

7 years agoAdd timeout and retry config options for SNMP plugin
Carlos Vicente [Tue, 17 Oct 2017 14:49:08 +0000 (14:49 +0000)]
Add timeout and retry config options for SNMP plugin

7 years agoipmi: make unhandled sensor msg more informative
Mytnyk, Volodymyr [Tue, 17 Oct 2017 09:26:58 +0000 (10:26 +0100)]
ipmi: make unhandled sensor msg more informative

Change-Id: I5fc6056b2d0c5bb5cb1b28c3d24aaca163eb245b
Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>
7 years ago[2475] write_prometheus plugin: Fix port listening
tcarreira [Thu, 12 Oct 2017 15:37:28 +0000 (16:37 +0100)]
[2475] write_prometheus plugin: Fix port listening

Signed-off-by: Florian Forster <octo@collectd.org>
7 years agoMerge pull request #2482 from outini/master
Pavel Rochnyak [Mon, 16 Oct 2017 13:41:33 +0000 (20:41 +0700)]
Merge pull request #2482 from outini/master

Implementation of "Prefix" option for write_http plugin

7 years agowrite_http: Allow to set empty metrics prefix in KAIROSDB format
Pavel Rochnyack [Mon, 16 Oct 2017 12:46:06 +0000 (19:46 +0700)]
write_http: Allow to set empty metrics prefix in KAIROSDB format

7 years agowrite_http: Added strdup() result check
Pavel Rochnyack [Mon, 16 Oct 2017 12:05:20 +0000 (19:05 +0700)]
write_http: Added strdup() result check

7 years agoSetting metrics_prefix as char const *
Denis 'jawa' Pompilio [Mon, 16 Oct 2017 08:15:50 +0000 (10:15 +0200)]
Setting metrics_prefix as char const *

7 years agoAdded denis pompilio to contributors
Denis 'jawa' Pompilio [Fri, 13 Oct 2017 12:28:44 +0000 (14:28 +0200)]
Added denis pompilio to contributors

7 years agoImplementation of "Prefix" for write_http plugin
Denis 'jawa' Pompilio [Thu, 12 Oct 2017 15:33:13 +0000 (17:33 +0200)]
Implementation of "Prefix" for write_http plugin

This option is only available for the KAIROSDB format
This option defaults to "collectd"

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 agoLeftover reference to hostname_g[].
Sean Campbell [Thu, 12 Oct 2017 01:31:45 +0000 (21:31 -0400)]
Leftover reference to hostname_g[].

7 years agoMake g_strings in perl.c not global so that hostname_g as a char* doesn't break it.x
Sean Campbell [Wed, 11 Oct 2017 21:50:56 +0000 (17:50 -0400)]
Make g_strings in perl.c not global so that hostname_g as a char* doesn't break it.x

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 agoipmi: add more analog sensors support
Mytnyk, VolodymyrX [Mon, 28 Nov 2016 16:57:49 +0000 (16:57 +0000)]
ipmi: add more analog sensors support

- Add support of new analog sensors:
  System Airflow, PS1 Input Power, MTT CPU1, MTT CPU2
- Extend list of sensors to support "memory" sensor type.
- Map sensors with a 'percent' flag to 'percent' type
  and add sensor type as a prefix to type_instance in
  this case. The type_instance of non % sensors will
  remain the same (just sensor name).

Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>
7 years agoMerge pull request #2300 from rpv-tomsk/fix-sread
Pavel Rochnyak [Wed, 11 Oct 2017 15:25:35 +0000 (22:25 +0700)]
Merge pull request #2300 from rpv-tomsk/fix-sread

Remove close() call from sread()

7 years agoMerge remote-tracking branch 'github/pr/2135'
Florian Forster [Wed, 11 Oct 2017 12:46:43 +0000 (14:46 +0200)]
Merge remote-tracking branch 'github/pr/2135'

7 years agopython: Addressed review comments
Mytnyk, Volodymyr [Tue, 10 Oct 2017 15:13:46 +0000 (16:13 +0100)]
python: Addressed review comments

- Run clang-format

Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>
7 years agoChanged return type of sread() and swrite() from 'ssize_t' to 'int'
Pavel Rochnyack [Mon, 31 Jul 2017 05:13:15 +0000 (12:13 +0700)]
Changed return type of sread() and swrite() from 'ssize_t' to 'int'

Functions 'sread()' and 'swrite()', unlike 'read()' and 'write()', does not return the number of bytes actually read/written.
They return error status, which is returned as 'int' type in Collectd code.

7 years agoProper check for `swrite()` return value
Pavel Rochnyack [Tue, 4 Jul 2017 09:14:05 +0000 (16:14 +0700)]
Proper check for `swrite()` return value

The `swrite()` can return positive value from `errno` in case of error.

7 years agoRemove close() call from sread()
Pavel Rochnyack [Fri, 26 May 2017 06:14:19 +0000 (12:14 +0600)]
Remove close() call from sread()

The sread() function should not close fd in any cases, that is unexpected.

7 years agowrite_prometheus plugin: Implement logging callback.
Florian Forster [Tue, 10 Oct 2017 20:38:05 +0000 (22:38 +0200)]
write_prometheus plugin: Implement logging callback.

7 years agoMerge pull request #2024 from rpv-tomsk/master-ipmi
Pavel Rochnyak [Tue, 10 Oct 2017 13:15:43 +0000 (20:15 +0700)]
Merge pull request #2024 from rpv-tomsk/master-ipmi

ipmi plugin: Implemented IPMI LAN connection and plugin improved

7 years agoipmi plugin: style
Pavel Rochnyack [Tue, 10 Oct 2017 10:37:03 +0000 (17:37 +0700)]
ipmi plugin: style

7 years agoipmi plugin: Refactored to use c_ipmi_notification_init_()
Pavel Rochnyack [Tue, 10 Oct 2017 10:31:18 +0000 (17:31 +0700)]
ipmi plugin: Refactored to use c_ipmi_notification_init_()

7 years agoipmi plugin: Fixed remarks found while review
Pavel Rochnyack [Tue, 10 Oct 2017 09:58:37 +0000 (16:58 +0700)]
ipmi plugin: Fixed remarks found while review

7 years agomemcached: Fix hitratio calculation
Pavel Rochnyack [Mon, 9 Oct 2017 20:08:38 +0000 (03:08 +0700)]
memcached: Fix hitratio calculation

If there is no requests, NAN is reported as hitratio.
If there is no hits - zero is reported.

7 years agoipmi plugin: Use cf_util_get_boolean()
Pavel Rochnyack [Mon, 9 Oct 2017 15:27:41 +0000 (22:27 +0700)]
ipmi plugin: Use cf_util_get_boolean()

7 years agomemcached: style changes
Pavel Rochnyack [Mon, 9 Oct 2017 14:34:49 +0000 (21:34 +0700)]
memcached: style changes

7 years agomemcached: Replace gauge_t with derive_t
Pavel Rochnyack [Mon, 9 Oct 2017 09:25:16 +0000 (16:25 +0700)]
memcached: Replace gauge_t with derive_t

7 years agomemcached: Fix CPU usage reporting
Pavel Rochnyack [Mon, 9 Oct 2017 10:22:00 +0000 (17:22 +0700)]
memcached: Fix CPU usage reporting

Signed-off-by: Florian Forster <octo@collectd.org>
7 years agomemcached: Renamed calculate_rate to calculate_ratio_percent
Pavel Rochnyack [Wed, 27 Sep 2017 12:07:37 +0000 (19:07 +0700)]
memcached: Renamed calculate_rate to calculate_ratio_percent

7 years agomemcached: Fix hitratio reporting
Pavel Rochnyack [Sun, 30 Jul 2017 10:33:49 +0000 (17:33 +0700)]
memcached: Fix hitratio reporting

When Collectd calculates 'hitratio', it divides two continiously-grown values of Memcached stats.
As result, reported metric contains the average since Memcached start, which is incorrect.

7 years agomemcached: Fix CPU usage reporting
Pavel Rochnyack [Mon, 9 Oct 2017 10:22:00 +0000 (17:22 +0700)]
memcached: Fix CPU usage reporting

7 years agoipmi plugin: Added a define for errors / messages buffer size
Pavel Rochnyack [Mon, 9 Oct 2017 05:52:21 +0000 (12:52 +0700)]
ipmi plugin: Added a define for errors / messages buffer size

7 years agoipmi plugin: Notify about IPMI connection state change
Pavel Rochnyack [Sun, 8 Oct 2017 06:41:29 +0000 (13:41 +0700)]
ipmi plugin: Notify about IPMI connection state change

7 years agoipmi plugin: Improvements
Pavel Rochnyack [Sun, 8 Oct 2017 06:23:32 +0000 (13:23 +0700)]
ipmi plugin: Improvements

* Do not request reading unless domain is connected
* Report instance name in error messages

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 agostyle
Wilfried Goesgens [Sun, 8 Oct 2017 11:52:15 +0000 (13:52 +0200)]
style

7 years agostatsd: Document collectd behaviour when receiving the 0.000 timer value
Pavel Rochnyack [Sun, 20 Mar 2016 08:51:26 +0000 (14:51 +0600)]
statsd: Document collectd behaviour when receiving the 0.000 timer value

Signed-off-by: Florian Forster <octo@collectd.org>
7 years agoipmi plugin: Code cleanup
Pavel Rochnyack [Sat, 7 Oct 2017 19:30:13 +0000 (02:30 +0700)]
ipmi plugin: Code cleanup

7 years agoCurrently curl_json will barely ignore boolean values in a non erroneous
Wilfried Goesgens [Sat, 7 Oct 2017 19:14:46 +0000 (21:14 +0200)]
Currently curl_json will barely ignore boolean values in a non erroneous
way, so that if you have an array like this:
you will be able to access the 123 number like

We now rather call our number parser with 0 for false, 1 for true.

7 years agoipmi plugin: Implemented IPMI LAN connection and plugin improved
Pavel Rochnyack [Fri, 4 Nov 2016 21:11:54 +0000 (03:11 +0600)]
ipmi plugin: Implemented IPMI LAN connection and plugin improved

* Added instances support
* Removed the sensor removal in case of reading errors
* Added the lock to do not request new readings until previous reading is complete
* Disabled SDRs local cache
* Added the check for sensors 'is readable' flag
* Added the check for sensor event reading type (if sensor is discrete or not)
* Added checks for sensor states 'scanning disabled' and 'initial update in progress'
* Changes in error reporting

7 years agoFixed issues with initializing hostname.
Sean Campbell [Fri, 6 Oct 2017 20:55:37 +0000 (16:55 -0400)]
Fixed issues with initializing hostname.

7 years agoFix kstat_ctl_t definition in globals.
campbellsean@google.com [Fri, 6 Oct 2017 18:23:18 +0000 (14:23 -0400)]
Fix kstat_ctl_t definition in globals.

7 years agoCleanup some defines and includes.
campbellsean@google.com [Fri, 6 Oct 2017 17:47:45 +0000 (13:47 -0400)]
Cleanup some defines and includes.

7 years agoAdds setter for hostname_g and eliminates hostname_g_size variable.
campbellsean@google.com [Fri, 6 Oct 2017 17:44:38 +0000 (13:44 -0400)]
Adds setter for hostname_g and eliminates hostname_g_size variable.

7 years agoAdd MIT license to new globals files.
campbellsean@google.com [Fri, 6 Oct 2017 17:40:43 +0000 (13:40 -0400)]
Add MIT license to new globals files.

7 years agoMerge remote-tracking branch 'github/pr/2469'
Florian Forster [Fri, 6 Oct 2017 13:33:29 +0000 (15:33 +0200)]
Merge remote-tracking branch 'github/pr/2469'