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

[Florian Forster]

 src/collectd.conf.pod |   19 ++++++++++++-------
 src/curl_json.c       |   12 +++++++++++-
 src/network.c         |   17 +++++++++++++++--
 3 files changed, 38 insertions(+), 10 deletions(-)

New commits:
commit eca80da0ace9897fda8842fd64ae5006e89bf420
Merge: 8a3968c f057f9a
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Wed Jul 30 18:08:32 2014 +0200

    Merge pull request #685 from teftin/curl-json-per-url-interval
    
    per-url intervals for curl_json

commit 8a3968c739163a86e26c3c5915fd84f1eca34ee0
Merge: 9679723 ff34da6
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Wed Jul 30 18:01:04 2014 +0200

    Merge pull request #687 from txaj/fix-doc-postgresmodule-sslmode
    
    Fixing misplaced block in documentation.

commit ff34da6b6b66c1d0f0dc869812d28e3355829237
Author: txaj <txaj at ovh.fr>
Date:   Wed Jul 30 09:55:58 2014 -0500

    Fixing misplaced block in documentation.

commit 9679723b9f177055ef93d0b1bbb420cca7ac6ea4
Merge: 22c1fc7 8fe384e
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Wed Jul 30 16:12:04 2014 +0200

    Merge pull request #654 from timl/fix_ttl_order
    
    Fix ttl order

commit f057f9a382bf1eb8a9fcd04715abb1ee6993f27f
Author: Stan Sawa <stan.sawa at unrulymedia.com>
Date:   Wed Sep 18 15:24:06 2013 +0100

    per-url intervals for curl_json

commit 8fe384e8d02d6cc1360113828f3ef3a34c24c3f8
Author: Tim Laszlo <Tim.Laszlo at magnetar.com>
Date:   Fri Jun 20 09:00:43 2014 -0500

    network: set ttl before opening server sockets
    
    If TimeToLive is defined in collectd.conf after Server options, the
    net_config_ttl value is updated after network_config_add_server and
    the desired ttl is not used.

commit 873ee04392be176051a22ad09ae1ae2fa224bfc7
Author: Tim Laszlo <Tim.Laszlo at magnetar.com>
Date:   Fri Jun 20 08:37:19 2014 -0500

    Warn if ttl is out of bounds