status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-11 14:24:39 +00:00
Code Issues Projects Releases Wiki Activity

Removes a merge conflict marker from the ACL guide.

Browse Source
This commit is contained in:
James Phillips 2017-07-18 07:35:17 -07:00 committed by GitHub
parent 28b747c3c0
commit 0c376fb656
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
website/source/docs/guides/acl.html.md
View File

@ -172,7 +172,6 @@ key "_rexec" {
The `service` policy needs `read` access for any services that can be registered on the agent. If [remote exec is disabled](/docs/agent/options.html#disable_remote_exec), the default, then the `key` policy can be omitted. The `service` policy needs `read` access for any services that can be registered on the agent. If [remote exec is disabled](/docs/agent/options.html#disable_remote_exec), the default, then the `key` policy can be omitted.
>>>>>>> Changes remote exec KV read to call GetTokenForAgent(), which can use
#### Bootstrapping ACLs #### Bootstrapping ACLs
Bootstrapping ACLs on a new cluster requires a few steps, outlined in the example in this Bootstrapping ACLs on a new cluster requires a few steps, outlined in the example in this