Merge remote-tracking branch 'github/pr/1915'

diff --cc src/collectd.conf.pod
index ab80915,c7a818d..ec2a0c5
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -7818,28 -7818,14 +7818,34 @@@ If set to B<true>, append the name of t
  identifier. If set to B<false> (the default), this is only done when there is
  more than one DS.
  
+ =item B<DropDuplicateFields> B<false>|B<true>
+ 
+ If set to B<true>, detect and remove duplicate components in Graphite metric
+ names. For example, the metric name  C<host.load.load.shortterm> will
+ be shortened to C<host.load.shortterm>.
+ 
  =back
  
 +=head2 Plugin C<write_log>
 +
 +The C<write_log> plugin writes metrics as INFO log messages.
 +
 +This plugin supports two output formats: I<Graphite> and I<JSON>.
 +
 +Synopsis:
 +
 + <Plugin write_log>
 +   Format Graphite
 + </Plugin>
 +
 +=over 4
 +
 +=item B<Format> I<Format>
 +
 +The output format to use. Can be one of C<Graphite> or C<JSON>.
 +
 +=back
 +
  =head2 Plugin C<write_tsdb>
  
  The C<write_tsdb> plugin writes data to I<OpenTSDB>, a scalable open-source

diff --cc src/write_graphite.c
Simple merge