From: Florian Forster <octo@collectd.org>
Date: Tue, 16 Jun 2015 20:46:06 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.6.0~683^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3812f29af0b4ae25d1e0114ee0afc4a83880e913;p=collectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

3812f29af0b4ae25d1e0114ee0afc4a83880e913
diff --cc README
index 9604fda3,430f52cd..3e2c0233
--- a/README
+++ b/README
@@@ -455,19 -413,11 +455,19 @@@ Feature
      - write_riemann
        Sends data to Riemann, a stream processing and monitoring system.
  
 +    - write_sensu
 +      Sends data to Sensu, a stream processing and monitoring system, via the
 +      Sensu client local TCP socket.
 +
 +    - write_tsdb
 +      Sends data OpenTSDB, a scalable no master, no shared state time series
 +      database.
 +
    * Logging is, as everything in collectd, provided by plugins. The following
-     plugins keep up informed about what's going on:
+     plugins keep us informed about what's going on:
  
      - logfile
 -      Writes logmessages to a file or STDOUT/STDERR.
 +      Writes log messages to a file or STDOUT/STDERR.
  
      - perl
        Log messages are propagated to plugins written in Perl as well.