status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1483 from sepn/master 

Change example filename to use .json instead of .js
This commit is contained in:
Ryan Breen 2015-12-09 15:01:16 -05:00
parent b756c9dace 48c2f68edc
commit bdfea6c3f8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
website/source/docs/agent/options.html.markdown
View File

@ -15,7 +15,7 @@ descriptions.
When loading configuration, Consul loads the configuration from files When loading configuration, Consul loads the configuration from files
and directories in lexical order. For example, configuration file `basic_config.json` and directories in lexical order. For example, configuration file `basic_config.json`
will be processed before `extra_config.js`. Configuration specified later will be processed before `extra_config.json`. Configuration specified later
will be merged into configuration specified earlier. In most cases, will be merged into configuration specified earlier. In most cases,
"merge" means that the later version will override the earlier. In "merge" means that the later version will override the earlier. In
some cases, such as event handlers, merging appends the handlers to the some cases, such as event handlers, merging appends the handlers to the