[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 src/daemon/collectd.c |  2 +-
 src/routeros.c        | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit a9191cc20f0a5af022ae1d9482af2eaf0098a46a
Merge: 57aad22 ca7b906
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Tue Jul 10 19:05:59 2018 +0700

    Merge branch 'collectd-5.8' into collectd-master

commit 57aad226f30cf4c2cd52a52ed1224eb150b27b80
Merge: e3a813c 9525da1
Author: Pavel Rochnyak <pavel2000 at ngs.ru>
Date:   Tue Jul 10 19:04:47 2018 +0700

    Merge pull request #2854 from rpv-tomsk/collectd-master
    
    routeros: Use MAC-address when Radio-name is missing

commit ca7b9060efa0039ddab1205883aa35ea6197e859
Author: Mariusz Bialonczyk <manio at skyboo.net>
Date:   Tue Jul 10 11:47:53 2018 +0200

    Fix parsing option for avoiding making BaseDir
    
    Parsing is broken since:
    386ecab4 Reading configuration file is now done outside main().
    So after mentioned commit we've got:
    
    collectd: invalid option -- 'B'
    
    This commit fixes this.

commit e3a813c4d25c0b0d661ef5329f316214e59cf681
Merge: 71d6263 ab93a14
Author: Pavel Rochnyak <pavel2000 at ngs.ru>
Date:   Tue Jul 10 17:29:02 2018 +0700

    Merge pull request #2856 from manio/master
    
    Fix parsing option for avoiding making BaseDir

commit ab93a143ac2c908b4cc692669290a1e9c26c62e9
Author: Mariusz Bialonczyk <manio at skyboo.net>
Date:   Tue Jul 10 11:47:53 2018 +0200

    Fix parsing option for avoiding making BaseDir
    
    Parsing is broken since:
    386ecab4 Reading configuration file is now done outside main().
    So after mentioned commit we've got:
    
    collectd: invalid option -- 'B'
    
    This commit fixes this.

commit 9525da134688ec04f01f3476686edd75084e12ec
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Mon Jul 9 14:51:33 2018 +0700

    routeros: Use MAC-address when Radio-name is missing