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

[Florian Forster]

 contrib/redhat/collectd.spec |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2e632b0929fb957fd686231658bc2999fdfb4b20
Merge: 6c17c8c 8dcf147
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Tue Nov 29 12:38:59 2016 +0100

    Merge branch 'collectd-5.6' into collectd-5.7
    
    Conflicts:
    	contrib/redhat/collectd.spec

commit 8dcf1473b25c4649289ea8b8fb5cb390f2493ce3
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Tue Nov 29 12:33:20 2016 +0100

    collectd.spec: also disable write_redis on EL6
    
    This plugin also depends on the hiredis library, which was retired from
    EPEL6.

commit 2079ee1517e34de372f58e7e2267ad5c71a8a41f
Merge: 8f5d58f 4f9adee
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Tue Nov 29 12:31:39 2016 +0100

    Merge branch 'collectd-5.5' into collectd-5.6
    
    Conflicts:
    	contrib/redhat/collectd.spec

commit 4f9adeefbf3d8e1a556d12e287a14019dacbfd04
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Tue Nov 29 11:48:40 2016 +0100

    collectd.spec: disable redis plugin on EL6
    
    hiredis has been retired from EPEL6

commit 8f5d58fe121bc25d6ba34346a58d922488ed181b
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Tue Nov 29 11:43:08 2016 +0100

    collectd.spec: disable redis plugin on EL6