toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #20604 from coolljt0725/fix_reload

Browse Source 
Fix configuration reloading
Upstream-commit: 20a038eca68e4188e1cd812293aea8cb220cf08f
Component: engine
This commit is contained in:
Vincent Demeester
2016-02-29 07:14:15 +01:00
parent 47c5b544ef ba3d7fd0c4
commit 5f0c16d34d
4 changed files with 115 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/engine/docs/reference/commandline/daemon.md
View File

@ -896,6 +896,8 @@ The list of currently supported options that can be reconfigured is this:
Updating and reloading the cluster configurations such as `--cluster-store`,
`--cluster-advertise` and `--cluster-store-opts` will take effect only if
these configurations were not previously configured. Configuration reload will
log a warning message if it detects a change in previously configured cluster
configurations.
these configurations were not previously configured. If `--cluster-store`
has been provided in flags and `cluster-advertise` not, `cluster-advertise`
can be added in the configuration file without accompanied by `--cluster-store`
Configuration reload will log a warning message if it detects a change in
previously configured cluster configurations.