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

[Florian Forster]

 configure.in          |    4 +--
 src/collectd.conf.pod |   11 ++++++-
 src/configfile.c      |   77 +++++++++++++++++++++++++++++++++++++++----------
 3 files changed, 74 insertions(+), 18 deletions(-)

New commits:
commit 6a8d29a816f8a1a6b2a1c82d5c33ceba8d006f25
Merge: c7d2dc3 d641c34
Author: Florian Forster <octo at collectd.org>
Date:   Wed Nov 28 10:16:26 2012 +0100

    Merge branch 'sh/config-include'

commit d641c344c11fd30abe9faab5668152f2e413f1b9
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Nov 28 09:44:59 2012 +0100

    configfile: Free a string buffer returned by cf_util_get_string().

commit 67aba0fb1e3a301d61b6c410be6a03d83243dc39
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Nov 28 09:32:43 2012 +0100

    config: Implemented include filter pattern as sub-option in a <Include> block.
    
    This has the advantage of being more easy to read/understand and also being
    more flexible. E.g. multiple filters and other options may be specified in the
    future.
    
    Thanks to octo for suggesting this!

commit 76910471b1d2b1d5f43d49286bf1f9a03a060f1c
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sat Nov 24 10:26:20 2012 +0100

    config: Added support for specifying include filter patterns.
    
    An optional second argument may now be passed to the "Include" configuration
    option. If specified (and if the fnmatch() function was available at build
    time), only files matching this pattern will be included. For example, the
    following will include all files matching "*.conf" in any subdirectory of
    /etc/collectd.d/:
    
      Include "/etc/collectd.d" "*.conf"
    
    This is useful, e.g. for distributions in order to include a possibly empty
    directory in the default configuration including all subdirectories but also
    making it possible to ship further documents like README files.