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

[Florian Forster]

 contrib/README                               |   15 ++++++
 contrib/docker/50docker-apt-conf             |    4 ++
 contrib/docker/Dockerfile                    |   24 ++++++++++
 contrib/docker/collectd.conf                 |   16 +++++++
 contrib/docker/collectd.conf.d/sample.conf   |    4 ++
 contrib/docker/rootfs_prefix/Makefile        |    2 +
 contrib/docker/rootfs_prefix/rootfs_prefix.c |   64 ++++++++++++++++++++++++++
 contrib/redhat/collectd.spec                 |    7 ++-
 8 files changed, 135 insertions(+), 1 deletion(-)

New commits:
commit fe6da88c2eb1637ef6dce0a7d928c202ededc450
Merge: a405225 2e632b0
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Tue Nov 29 12:39:33 2016 +0100

    Merge branch 'collectd-5.7'

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 a405225945b75555dfbf515226e7cad3322d0b66
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Tue Nov 29 12:21:29 2016 +0100

    contrib: clang-format rootfs_prefix.c

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

commit eec0cd9ca51c5c132ed09fc4699c02f3bd12d748
Merge: 6c17c8c 422c3bb
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Tue Nov 29 11:26:24 2016 +0100

    Merge pull request #2041 from mfournier/contrib-docker
    
    Add sample Dockerfile & LD_PRELOAD wrapper to contrib

commit 422c3bb3be01a222466db41a744dcdcb7f6963fd
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Nov 16 10:10:10 2016 +0100

    contrib/docker: add instructions to README

commit da6722c3cf7ace6c922bb1952a49aebb7c65180b
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Nov 16 10:00:44 2016 +0100

    contrib/docker: add minimal example config file

commit 91155abc90fa8d4eecb557e0490a42f9c2129c3c
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Oct 12 07:14:20 2016 +0200

    contrib/docker: add basic Dockerfile & config files

commit c76419c0cf983f1ecd3d36aa236cc4e3f9cff733
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Oct 5 08:09:09 2016 +0200

    contrib/docker: add LD_PRELOAD wrapper to fopen/open/opendir syscalls