From cc24a65d45c647aa71f930f0d862e1bb6970362b Mon Sep 17 00:00:00 2001 From: Geoffrey Grosenbach Date: Thu, 5 Jul 2018 15:23:39 -0700 Subject: [PATCH] Notes that both "hcl" and "json" files are loaded from the config-dir. The previous version only mentioned "json" but the behavior was to read "hcl" files as well. --- website/source/docs/agent/options.html.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/agent/options.html.md b/website/source/docs/agent/options.html.md index 4e2ecb303..b0d4438c6 100644 --- a/website/source/docs/agent/options.html.md +++ b/website/source/docs/agent/options.html.md @@ -136,7 +136,7 @@ will exit with an error at startup. * `-config-dir` - A directory of configuration files to load. Consul will - load all files in this directory with the suffix ".json". The load order + load all files in this directory with the suffix ".json" or ".hcl". The load order is alphabetical, and the the same merge routine is used as with the [`config-file`](#_config_file) option above. This option can be specified multiple times to load multiple directories. Sub-directories of the config directory are not loaded.