Merge branch 'master' into pri
authorSean Campbell <seancampbell04@gmail.com>
Wed, 6 Dec 2017 00:05:08 +0000 (19:05 -0500)
committerGitHub <noreply@github.com>
Wed, 6 Dec 2017 00:05:08 +0000 (19:05 -0500)
commit4c4988b1c5d33ed70b2d6d6e5a4eae13cab9255b
treef63f086b940c07a4cf1598f950a9bb35d0c9dd1e
parent7b8851b26928b609ce850e78c1eabb50ff319244
parent8e5e2e927f9cf051ef210473b1b48ff62d81f585
Merge branch 'master' into pri
34 files changed:
src/amqp.c
src/barometer.c
src/ceph.c
src/csv.c
src/daemon/common.c
src/daemon/plugin.c
src/daemon/types_list.c
src/dpdkstat.c
src/email.c
src/gmond.c
src/libcollectdclient/network_parse.c
src/libcollectdclient/network_parse_test.c
src/modbus.c
src/netlink.c
src/network.c
src/ntpd.c
src/perl.c
src/ping.c
src/powerdns.c
src/processes.c
src/rrdcached.c
src/rrdtool.c
src/snmp.c
src/snmp_agent.c
src/table.c
src/utils_cmd_getthreshold.c
src/utils_cmd_getval.c
src/utils_format_json.c
src/utils_ovs.c
src/virt.c
src/write_graphite.c
src/write_riemann.c
src/write_sensu.c
src/write_tsdb.c