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

website: document precedence of Atlas endpoint inputs

This commit is contained in:
Ryan Uber 2015-08-27 17:54:47 -07:00
parent 6ac89c28a8
commit 4adc0b5c66
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/static/base.css.map Normal file
View File

File diff suppressed because one or more lines are too long

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

@ -66,7 +66,9 @@ The options below are all specified on the command-line.
* <a name="_atlas_endpoint"></a><a href="#_atlas_endpoint">`-atlas-endpoint`</a> - The endpoint
address used for Atlas integration. Used only if the `-atlas` and
`-atlas-token` options are specified. This is optional, and defaults to the
public Atlas endpoints.
public Atlas endpoints. This can also be specified using the `SCADA_ENDPOINT`
environment variable. The CLI option takes precedence, followed by the
configuration file directive, and lastly, the environment variable.
* <a name="_bootstrap"></a><a href="#_bootstrap">`-bootstrap`</a> - This flag is used to control if a
server is in "bootstrap" mode. It is important that