Merge branch 'pr/846'

diff --combined src/collectd.conf.in
index 63bdb23,1c14759..eb23023
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -1137,7 -1137,6 +1137,7 @@@
  #  DeleteTimers   false
  #  DeleteGauges   false
  #  DeleteSets     false
 +#  CounterSum     false
  #  TimerPercentile 90.0
  #  TimerPercentile 95.0
  #  TimerPercentile 99.0
@@@ -1348,6 -1347,7 +1348,7 @@@
  #    Host "localhost"
  #    Port "2003"
  #    Protocol "tcp"
+ #    ReconnectInterval 0
  #    LogSendErrors true
  #    Prefix "collectd"
  #    Postfix "collectd"

diff --combined src/collectd.conf.pod
index 9e2f652,84c7772..7c5a3c0
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -6232,12 -6232,6 +6232,12 @@@ rate of counters and size of sets will 
  are unchanged. If set to B<True>, the such metrics are not dispatched and
  removed from the internal cache.
  
 +=item B<CounterSum> B<false>|B<true>
 +
 +When enabled, create a C<count> metric which reports the change since the last
 +read. This option primarily exists for compatibility with the I<statsd>
 +impelemtation by Etsy.
 +
  =item B<TimerPercentile> I<Percent>
  
  Calculate and dispatch the configured percentile, i.e. compute the latency, so
@@@ -7277,6 -7271,14 +7277,14 @@@ Service name or port number to connect 
  
  Protocol to use when connecting to I<Graphite>. Defaults to C<tcp>.
  
+ =item B<ReconnectInterval> I<Seconds>
+ 
+ When set to non-zero, forces the connection to the Graphite backend to be
+ closed and re-opend periodically. This behavior is desirable in environments
+ where the connection to the Graphite backend is done through load balancers,
+ for example. When set to zero, the default, the connetion is kept open for as
+ long as possible.
+ 
  =item B<LogSendErrors> B<false>|B<true>
  
  If set to B<true> (the default), logs errors when sending data to I<Graphite>.