From: Marat Salimzianov <marat.salimzianov@tomtom.com>
Date: Tue, 26 Feb 2019 10:34:58 +0000 (+0100)
Subject: Merge branch 'master' into write_graphite_escape_fix
X-Git-Tag: collectd-5.11.0~14^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b1bfb9d26af64133d080933f1eb4f0b53ce7ade;p=thirdparty%2Fcollectd.git

Merge branch 'master' into write_graphite_escape_fix
---

9b1bfb9d26af64133d080933f1eb4f0b53ce7ade
diff --cc src/utils/format_graphite/format_graphite.c
index a20ca30e5,d0e047ff8..5483c2faa
--- a/src/utils/format_graphite/format_graphite.c
+++ b/src/utils/format_graphite/format_graphite.c
@@@ -23,13 -23,13 +23,13 @@@
  
  #include "collectd.h"
  
- #include "common.h"
  #include "plugin.h"
+ #include "utils/common/common.h"
  
+ #include "utils/format_graphite/format_graphite.h"
  #include "utils_cache.h"
- #include "utils_format_graphite.h"
  
 -#define GRAPHITE_FORBIDDEN " \t\"\\:!/()\n\r"
 +#define GRAPHITE_FORBIDDEN " \t\"\\:!,/()\n\r"
  
  /* Utils functions to format data sets in graphite format.
   * Largely taken from write_graphite.c as it remains the same formatting */