Merge branch 'collectd-4.8'

Conflicts:
	src/types.db

diff --combined README
index 07a7415,ea53dba..a737f86
--- 1/README
--- 2/README
+++ b/README
@@@ -148,10 -148,6 +148,10 @@@ Feature
        MySQL server statistics: Commands issued, handlers triggered, thread
        usage, query cache utilization and traffic/octets sent and received.
  
 +    - netapp
 +      Plugin to query performance values from a NetApp storage system using the
 +      “Manage ONTAP” SDK provided by NetApp.
 +
      - netlink
        Very detailed Linux network interface and routing statistics. You can get
        (detailed) information on interfaces, qdiscs, classes, and, if you can
@@@ -507,10 -503,6 +507,10 @@@ Prerequisite
      Unsurprisingly used by the `mysql' plugin.
      <http://dev.mysql.com/>
  
 +  * libnatapp (optional)
 +    Required for the “netapp” plugin.
 +    This library is part of the “Manage ONTAP SDK” published by NetApp.
 +
    * libnetlink (optional)
      Used, obviously, for the `netlink' plugin.
      <http://www.linuxfoundation.org/en/Net:Iproute2>
@@@ -581,7 -573,7 +581,7 @@@
  
    * libyajl (optional)
      Parse JSON data. This is needed for the `curl_json' plugin.
-     <http://www.lloydforge.org/projects/yajl/>
+     <http://github.com/lloyd/yajl>
  
  Configuring / Compiling / Installing
  ------------------------------------

diff --combined src/types.db
index c6526d4,8ac9dd4..960674c
--- 1/src/types.db
--- 2/src/types.db
+++ b/src/types.db
@@@ -12,7 -12,6 +12,7 @@@ ath_nodes             value:GAUGE:0:6553
  ath_stat              value:COUNTER:0:4294967295
  bitrate                       value:GAUGE:0:4294967295
  bytes                 value:GAUGE:0:U
 +cache_ratio           value:GAUGE:0:100
  cache_result          value:COUNTER:0:4294967295
  cache_size            value:GAUGE:0:4294967295
  charge                        value:GAUGE:0:U
@@@ -26,12 -25,9 +26,12 @@@ current                     value:GAUGE:U:
  delay                 seconds:GAUGE:-1000000:1000000
  derive                        value:DERIVE:0:U
  df                    used:GAUGE:0:1125899906842623, free:GAUGE:0:1125899906842623
 +df_complex            value:GAUGE:0:U
 +disk_latency          read:GAUGE:0:U, write:GAUGE:0:U
  disk_merged           read:COUNTER:0:4294967295, write:COUNTER:0:4294967295
  disk_octets           read:COUNTER:0:17179869183, write:COUNTER:0:17179869183
  disk_ops              read:COUNTER:0:4294967295, write:COUNTER:0:4294967295
 +disk_ops_complex      value:COUNTER:0:4294967296
  disk_time             read:COUNTER:0:1000000, write:COUNTER:0:1000000
  dns_answer            value:COUNTER:0:65535
  dns_notify            value:COUNTER:0:65535
@@@ -54,7 -50,7 +54,7 @@@ email_count           value:GAUGE:0:
  email_size            value:GAUGE:0:U
  entropy                       entropy:GAUGE:0:4294967295
  fanspeed              value:GAUGE:0:U
- file_size               bytes:GAUGE:0:U
+ file_size             bytes:GAUGE:0:U
  files                 value:GAUGE:0:U
  frequency             frequency:GAUGE:0:U
  frequency_offset      ppm:GAUGE:-1000000:1000000
@@@ -125,8 -121,7 +125,8 @@@ ps_stacksize               value:GAUGE:0:92233720368
  ps_state              value:GAUGE:0:65535
  ps_vm                 value:GAUGE:0:9223372036854775807
  queue_length          value:GAUGE:0:U
- records                 count:GAUGE:0:U
 +response_time         value:GAUGE:0:U
+ records                       count:GAUGE:0:U
  route_etx             value:GAUGE:0:U
  route_metric          value:GAUGE:0:U
  routes                        value:GAUGE:0:U