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

[Florian Forster]

 src/apache.c         |    1 +
 src/ascent.c         |    1 +
 src/bind.c           |    1 +
 src/collectd.conf.in |    2 +-
 src/curl.c           |    1 +
 src/filter_chain.c   |    2 +-
 src/nginx.c          |    2 ++
 7 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 03aa21f08fede809f37a7443d3124fb9314f4dc8
Merge: dbbdb25542df6d9afbfddf78a3b1a8fee9029a80 17a04c7afcf44707f6bc45697212c1f8fc6aa761
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Aug 20 13:52:34 2009 +0200

    Merge branch 'collectd-4.6' into collectd-4.7
    
    Conflicts:
    	src/apache.c

commit 17a04c7afcf44707f6bc45697212c1f8fc6aa761
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Aug 20 13:48:23 2009 +0200

    Plugins using libcurl: Enable the ‘CURLOPT_FOLLOWLOCATION’ option.
    
    This hopefully fixes Debian#541953.

commit b4346f93d26c0f4f2afe39539f7812b0720a70ff
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Aug 18 09:55:42 2009 +0200

    Removed remaining traces of the "main" chain.
    
    The chains are called "PreCache" and "PostCache" now.