From: Florian Forster <octo@collectd.org>
Date: Tue, 13 Sep 2016 20:27:34 +0000 (+0200)
Subject: Merge branch 'collectd-5.6'
X-Git-Tag: collectd-5.7.0~96
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=03af72c5ef8b98ddfcab87ea44b764f5b0e165aa

Merge branch 'collectd-5.6'

Conflicts:
	src/collectd.conf.in
---

03af72c5ef8b98ddfcab87ea44b764f5b0e165aa
diff --cc src/collectd.conf.in
index 7ac9f2d2,f0ac2871..6a207aba
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -1415,7 -1408,7 +1415,8 @@@
  #    StoreRates true
  #    AlwaysAppendDS false
  #    EscapeCharacter "_"
+ #    SeparateInstances false
 +#    DropDuplicateFields false
  #  </Node>
  #</Plugin>