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

[Florian Forster]

 Makefile.am                  |    4 +-
 configure.ac                 |    6 ++
 contrib/redhat/collectd.spec |   23 ++++++
 m4/ax_compare_version.m4     |  177 ++++++++++++++++++++++++++++++++++++++++++
 src/curl_json.c              |  150 +++++++++++++++++++----------------
 src/curl_json_test.c         |    8 +-
 6 files changed, 298 insertions(+), 70 deletions(-)

New commits:
commit c144ae4659e129a929afb67706a54604220fef43
Merge: 8858811 17e1d81
Author: Florian Forster <octo at collectd.org>
Date:   Fri May 19 08:04:44 2017 +0200

    Merge remote-tracking branch 'github/pr/2285'

commit 8858811d487e8edc576ff7b0216d663949055a66
Merge: b165cd1 967f170
Author: Florian Forster <ff at octo.it>
Date:   Fri May 19 06:52:39 2017 +0200

    Merge pull request #2290 from BrandonArp/snmp_agent_rpm
    
    allow configuration of snmp_agent in rpm builds

commit 967f1706e66d24ae59ee8dda4adff4c6f51863b7
Author: Brandon Arp <brandon.arp at smartsheet.com>
Date:   Thu May 18 14:38:33 2017 -0700

    allow configuration of snmp_agent in rpm builds

commit b165cd13cd30a30ac830df1f6f6fbd52474a6f64
Merge: 662c44a ac9a491
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Thu May 18 11:19:09 2017 +0200

    Merge pull request #2287 from BrandonArp/fix_am_1_11
    
    fix build on automake 1.11

commit 17e1d8131433d5c737a568c9e85df735c6bcd7b0
Author: Florian Forster <octo at collectd.org>
Date:   Wed May 17 08:17:38 2017 +0200

    curl_json plugin: Work around a limitation in EPEL6's GCC.

commit ac9a49170d39b6c3cde0207d9eb38125e60d9d78
Author: Brandon Arp <brandon.arp at smartsheet.com>
Date:   Tue May 16 18:38:48 2017 -0700

    fix build on automake 1.11

commit 307bf74a8cef765fcd5d788f6aad5b2e9bdf670b
Author: Florian Forster <octo at collectd.org>
Date:   Tue May 16 22:44:26 2017 +0200

    curl_json plugin: Refactor the way trees/keys are stored.
    
    Previously, keys had a "magic" as their first member which was used to
    differentiate between the two types when they were returned from the
    binary search tree.
    
    This patch creates a new struct, cj_tree_entry_t, which includes an enum
    identifying which union member is valid.