From 62180eea33c384e8c50f06efc8f7638f2ab28e62 Mon Sep 17 00:00:00 2001 From: amandahla Date: Tue, 8 Nov 2016 15:32:07 -0200 Subject: [PATCH] Conflicts resolved. --- plugins/outputs/elasticsearch/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/outputs/elasticsearch/README.md b/plugins/outputs/elasticsearch/README.md index 59effb2a7..2f4cf705e 100644 --- a/plugins/outputs/elasticsearch/README.md +++ b/plugins/outputs/elasticsearch/README.md @@ -3,7 +3,7 @@ This plugin writes to [Elasticsearch](https://www.elastic.co) via Elastic (http://olivere.github.io/elastic/). Attention: -Elasticsearch 2.x does not support this dots-to-object transformation and so dots in field names are not allowed in versions 2.X. + Elasticsearch 2.x does not support this dots-to-object transformation and so dots in field names are not allowed in versions 2.X. In this case, dots will be replaced with "_". ### Configuration: