Merge branch 'stable-2.14'

* stable-2.14:
  Fix asciidoctor warning in config-gerrit
  Set version to 2.14
  version.py: Fix replacement in version.bzl

Change-Id: I3c9f52992e9f3e089ad12be57d4c7d92f2d9e145
This commit is contained in:
David Pursehouse
2017-04-26 16:44:18 +02:00

View File

@@ -2771,7 +2771,7 @@ The value is in the usual time-unit format like "1 m", "5 m".
+ +
Defaults to `5 m` Defaults to `5 m`
===== Elasticsearch server(s) configuration ==== Elasticsearch server(s) configuration
Each section correspond to one Elasticsearch server. Each section correspond to one Elasticsearch server.