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

[Florian Forster]

 src/collectd.c        |   12 +++++++++---
 src/collectd.conf.pod |    3 ++-
 src/collectd.pod      |    7 +++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 8fdec2467f3d4566185a9c9d757376aa3d30413b
Merge: ea44b73fd56bb1875d36f4bae02c463a0c611096 2bdfc256b1445ac61845e20d0bfd01a26e0b845d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Oct 22 18:32:58 2006 +0200

    Merge branch 'sh-pidfile'

commit 2bdfc256b1445ac61845e20d0bfd01a26e0b845d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Oct 22 18:31:48 2006 +0200

    Completed the documentation of the new `-P' commandline option.
    
    Additionally the `have_pidfile' variable was eliminated.

commit e109cd486b6075425e58ceeb25fcf9de14797d2b
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Oct 11 23:03:42 2006 +0200

    Add the `-P' command line option.
    
    This option may be used to set the pid file, overwriting any settings found
    in the config file.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>