Merge branch 'collectd-4.2'

Conflicts:

	src/types.db

diff --cc src/exec.c
Simple merge

diff --cc src/types.db
index 919a3ecd1fece8f530d1dbd07cfada414b42cf15,bfd400c029256b2a13987151319c8fb6818e8e55..a19f26dc997a9d2513f8dc3d5221307384ebfa9f
--- 1/src/types.db
--- 2/src/types.db
+++ b/src/types.db
@@@ -40,6 -40,6 +40,11 @@@ ipt_bytes            value:COUNTER:0:13421772
  ipt_packets           value:COUNTER:0:134217728
  irq                   value:COUNTER:U:65535
  load                  shortterm:GAUGE:0:100, midterm:GAUGE:0:100, longterm:GAUGE:0:100
++memcached_command     value:COUNTER:0:U
++memcached_connections value:GAUGE:0:U
++memcached_items               value:GAUGE:0:U
++memcached_octets      rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
++memcached_ops         value:COUNTER:0:134217728
  memory                        value:GAUGE:0:281474976710656
  multimeter            value:GAUGE:U:U
  mysql_commands                value:COUNTER:0:U
@@@ -48,11 -48,11 +53,6 @@@ mysql_octets                rx:COUNTER:0:4294967295, 
  mysql_qcache          hits:COUNTER:0:U, inserts:COUNTER:0:U, not_cached:COUNTER:0:U, lowmem_prunes:COUNTER:0:U, queries_in_cache:GAUGE:0:U
  mysql_threads         running:GAUGE:0:U, connected:GAUGE:0:U, cached:GAUGE:0:U, created:COUNTER:0:U
  nfs_procedure         value:COUNTER:0:4294967295
--memcached_command     value:COUNTER:0:U
--memcached_connections value:GAUGE:0:U
--memcached_items               value:GAUGE:0:U
--memcached_octets      rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
--memcached_ops         value:COUNTER:0:134217728
  nginx_connections     value:GAUGE:0:U
  nginx_requests                value:COUNTER:0:134217728
  percent                       percent:GAUGE:0:100.1
@@@ -67,17 -72,11 +72,13 @@@ swap                       value:GAUGE:0:109951162777
  tcp_connections               value:GAUGE:0:4294967295
  temperature           value:GAUGE:-273.15:U
  time_dispersion               seconds:GAUGE:-1000000:1000000
- time_offset           seconds:GAUGE:-1000000:1000000
  timeleft              timeleft:GAUGE:0:3600
- voltage                       value:GAUGE:U:U
- serial_octets         rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
- swap                  value:GAUGE:0:1099511627776
+ time_offset           seconds:GAUGE:-1000000:1000000
  users                 users:GAUGE:0:65535
- vs_threads            value:GAUGE:0:65535
- vs_processes          value:GAUGE:0:65535
 +virt_cpu_total                ns:COUNTER:0:256000000000
 +virt_vcpu             ns:COUNTER:0:1000000000
+ voltage_threshold     value:GAUGE:U:U, threshold:GAUGE:U:U
+ voltage                       value:GAUGE:U:U
  vs_memory             value:GAUGE:0:9223372036854775807
- signal_quality                value:GAUGE:0:U
- signal_power          value:GAUGE:U:0
- signal_noise          value:GAUGE:U:0
+ vs_processes          value:GAUGE:0:65535
+ vs_threads            value:GAUGE:0:65535