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

[Florian Forster]

 src/collectd.conf.in  |    6 ++++++
 src/collectd.conf.pod |    3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 533dba5626961fae399a4523837bdf7523692e78
Merge: b75b88c7dcb5e648dbc4bec2e2fbbaa3778b78b4 df6f5e387b589b665f3be9099f6a27a84a805e09
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Jul 22 22:38:29 2006 +0200

    Merge branch 'origin'

commit b75b88c7dcb5e648dbc4bec2e2fbbaa3778b78b4
Merge: be7450d5e6e384c1f7ef7628e5ea27e77afbb582 179d9b650db685f5f04f36a3019e4ffea377d960
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Jul 22 22:36:46 2006 +0200

    Merge branch 'collectd-3.10'

commit 179d9b650db685f5f04f36a3019e4ffea377d960
Merge: 7e2c12a9fd5b22ddecd7454945ac1ec2061e9050 8a94ccd77411761bc33dd5c163f36eb4c954237f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Jul 22 22:34:27 2006 +0200

    Merge branch 'collectd-3.10' of octo at verplant.org:/var/lib/git/collectd into collectd-3.10

commit 7e2c12a9fd5b22ddecd7454945ac1ec2061e9050
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Jul 22 22:33:43 2006 +0200

    collectd.conf.pod: Fix the synopsis: There is not `Port' option.
    
    [22:23] <@tokkee> octo: Also laut deiner Manpage ist Listen ein Alias fuer Server und es gibt auch ne Option "Port" ;-)

commit 922603951a288f0357fb232bcb05370fd09e77b5
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Jul 22 22:28:40 2006 +0200

    collectd.conf.in: Added (commented) lines for the `Listen' and `Server' options.
    
    [22:20] <@tokkee> octo: Koenntest du bitte im naechsten Release von collectd in das Config-File auskommentierte Bsp-Zeilen fuer "Server" und "Port" mit rein nehmen?
    [22:20] <@octo> tokkee: Ja, kann ich machen..
    [22:21] <@tokkee> octo: Thx.
    [22:21] <@tokkee> octo: Dann brauch ich wegen so was net mit patchen im Paket anfangen ;-)