Merge branch 'collectd-5.1' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Mon, 14 Jan 2013 09:53:21 +0000 (10:53 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 14 Jan 2013 09:53:21 +0000 (10:53 +0100)
1  2 
src/types.db

diff --combined src/types.db
@@@ -60,8 -60,8 +60,8 @@@ fanspeed              value:GAUGE:0:
  file_size             value:GAUGE:0:U
  files                 value:GAUGE:0:U
  fork_rate             value:DERIVE:0:U
 -frequency             value:GAUGE:0:U
  frequency_offset      value:GAUGE:-1000000:1000000
 +frequency             value:GAUGE:0:U
  fscache_stat          value:DERIVE:0:U
  gauge                 value:GAUGE:U:U
  hash_collisions               value:DERIVE:0:U
@@@ -109,11 -109,6 +109,11 @@@ node_stat                value:DERIVE:0:
  node_tx_rate          value:GAUGE:0:127
  operations            value:DERIVE:0:U
  percent                       value:GAUGE:0:100.1
 +pf_counters           value:DERIVE:0:U
 +pf_limits             value:DERIVE:0:U
 +pf_source             value:DERIVE:0:U
 +pf_states             value:GAUGE:0:U
 +pf_state              value:DERIVE:0:U
  pg_blks                       value:DERIVE:0:U
  pg_db_size            value:GAUGE:0:U
  pg_n_tup_c            value:DERIVE:0:U
@@@ -122,8 -117,8 +122,8 @@@ pg_numbackends             value:GAUGE:0:
  pg_scan                       value:DERIVE:0:U
  pg_xact                       value:DERIVE:0:U
  ping_droprate         value:GAUGE:0:100
 -ping                  value:GAUGE:0:65535
  ping_stddev           value:GAUGE:0:65535
 +ping                  value:GAUGE:0:65535
  players                       value:GAUGE:0:1000000
  power                 value:GAUGE:0:U
  protocol_counter      value:DERIVE:0:U
@@@ -158,7 -153,7 +158,7 @@@ tcp_connections            value:GAUGE:0:42949672
  temperature           value:GAUGE:-273.15:U
  threads                       value:GAUGE:0:U
  time_dispersion               value:GAUGE:-1000000:1000000
- timeleft              value:GAUGE:0:3600
+ timeleft              value:GAUGE:0:U
  time_offset           value:GAUGE:-1000000:1000000
  total_bytes           value:DERIVE:0:U
  total_connections     value:DERIVE:0:U