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

[Florian Forster]

 ChangeLog                              |   49 ++++++++++++++++++++++++++++++++
 src/collectd.conf.in                   |   14 ++++-----
 src/libcollectdclient/network.c        |    6 ++++
 src/libcollectdclient/network_buffer.c |    5 ++++
 src/network.c                          |    5 ++++
 version-gen.sh                         |    2 +-
 6 files changed, 73 insertions(+), 8 deletions(-)

New commits:
commit 1df230296479af1e349e6c08a193148375cfe8eb
Author: Florian Forster <octo at collectd.org>
Date:   Sat Nov 17 13:12:42 2012 +0100

    Bump version to 5.2.0; Update ChangeLog.

commit 39c70ef038bc5b399aa05bb49976f80a6480ed8d
Author: Ed Schouten <ed at 80386.nl>
Date:   Sat Nov 17 10:47:07 2012 +0100

    src/libcollectdclient/network.c: Fix the build on FreeBSD.
    
    On FreeBSD, we have to include <netinet/in.h> to get IN_MULTICAST(). We
    don't need to include anything extra, as according to POSIX,
    <netinet/in.h> also exposes htonl(). There is no need to include
    <arpa/inet.h>.
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 7bd436249b37b04807bbe7491998a9528056919f
Author: Ed Schouten <ed at 80386.nl>
Date:   Sat Nov 17 10:44:48 2012 +0100

    src/libcollectdclient/network_buffer.c: Fix gcrypt build on FreeBSD.
    
    As with src/network.c, we need to ensure that we define
    GCRYPT_NO_DEPRECATED on FreeBSD to get rid of the compiler warnings
    emitted by the header file.
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 05fb05dcf56a4676956c38d7a33ae5e6967ac331
Merge: e072b3e b850c79
Author: Florian Forster <octo at collectd.org>
Date:   Sat Nov 17 12:41:34 2012 +0100

    Merge branch 'collectd-5.1'

commit e072b3e9cc0188bf85912c95bb97d9b0de443915
Merge: 25fa4ad 4311038
Author: Florian Forster <octo at collectd.org>
Date:   Sat Nov 17 12:41:26 2012 +0100

    Merge remote-tracking branch 'origin/master'

commit b850c79322880d2b1936bc8babaf42e3657d942b
Merge: 3066976 cc0bb2b
Author: Florian Forster <octo at collectd.org>
Date:   Sat Nov 17 12:41:09 2012 +0100

    Merge branch 'collectd-5.0' into collectd-5.1

commit cc0bb2b472628ccede974a02c822d1f9189f0d21
Merge: 494386d 55832a2
Author: Florian Forster <octo at collectd.org>
Date:   Sat Nov 17 12:41:00 2012 +0100

    Merge branch 'collectd-4.10' into collectd-5.0

commit 25fa4ad93203289ec8d78e8d4b687acc3c05004a
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Fri Nov 16 12:12:19 2012 +0100

    fixed paths in example configuration file
    
    These paths previously got expanded to:
      #BaseDir "/usr/var/lib/collectd"
    instead of:
      #BaseDir "/var/lib/collectd"
    
    And on systems which put libs in /usr/lib64:
      #PluginDir   "/usr/lib/collectd"
    instead of:
      #PluginDir   "/usr/lib64/collectd"
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 55832a2197b65223bbfaff233dab755384c33a86
Author: Ed Schouten <ed at 80386.nl>
Date:   Fri Nov 16 21:58:46 2012 +0100

    src/network.c: Fix the build on FreeBSD.
    
    <gcrypt.h> accepts a definition called GCRYPT_NO_DEPRECATED to disable
    deprecated functionality. Unfortunately, this definition is not
    sufficient to suppress all warnings. However, FreeBSD's version of
    libgcrypt has been fixed to properly remove all deprecated features.
    
    Signed-off-by: Florian Forster <octo at collectd.org>