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

[Florian Forster]

 src/Makefile.am       |    3 +-
 src/collectd.conf.pod |  128 ++++--
 src/network.c         | 1213 +++++++++++++++++++++++++++++++------------------
 src/utils_fbhash.c    |  270 +++++++++++
 src/utils_fbhash.h    |   47 ++
 5 files changed, 1167 insertions(+), 494 deletions(-)

New commits:
commit 2aaf8463bb35544b9e631c658521994a2c0927d3
Merge: d1e62aa4497458ed86d20f5ef1b6c00d50596da0 1c1ebb06259ee0fd215faf5c0c4d722bb48ea726
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Apr 25 23:58:23 2009 +0200

    Merge branch 'ff/auth'

commit 1c1ebb06259ee0fd215faf5c0c4d722bb48ea726
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Apr 25 23:56:27 2009 +0200

    collectd.conf(5): Add some information about the AuthFile format.

commit 476c9ceb31dc6a7b4e83b50cb6aaf6b94ca68b4a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Apr 25 23:33:42 2009 +0200

    network plugin: Defines for non-gcrypt-code.

commit bf817ce51bda960defd900afb5474d356cd42eff
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Apr 25 23:27:49 2009 +0200

    collectd.conf(5): Document the new authentication stuff.

commit 688317517dc8909d786cffba8441434c4efb8c98
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Apr 25 15:39:11 2009 +0200

    network plugin: Some fixed to get encryption up and running again.
    
    Wow, that was easy!

commit 72be377eaaeda26f4268aba543a2677db3940666
Merge: e71f1ea2ff2dccbb6ed32ede58bb0e0ed19374bd bcd6151b05ee67e7b916bfa575a25b751585a4f8
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Apr 25 15:29:08 2009 +0200

    Merge branch 'master' into ff/auth
    
    Conflicts:
    	src/network.c

commit e71f1ea2ff2dccbb6ed32ede58bb0e0ed19374bd
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Apr 25 15:16:32 2009 +0200

    network plugin: Move towards a user/password based solution.

commit 69362465fa6074dd1ef8460723a1e4fc793ac8ad
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Apr 25 15:16:01 2009 +0200

    src/utils_fbhash.c: Implementation of a file-backed hash.
    
    This is going to be used for password files on the server.