docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix check code for --cluster-store and --cluster-advertise in config_unix.go 

Signed-off-by: Wonjun Kim <wonjun.kim@navercorp.com>
(cherry picked from commit 4f671ae85e62d0b413f913b1289100ae7cc45972)
This commit is contained in:
Wonjun Kim 2016-06-29 02:23:35 +09:00 committed by Tibor Vass
parent 712cbdbe1f
commit bd572fcd8f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/config_unix.go
View File

@ -123,7 +123,7 @@ func (config *Config) GetAllRuntimes() map[string]types.Runtime {
}
func (config *Config) isSwarmCompatible() error {
if config.IsValueSet("cluster-store") || config.IsValueSet("cluster-advertise") {
if config.ClusterStore != "" || config.ClusterAdvertise != "" {
return fmt.Errorf("--cluster-store and --cluster-advertise daemon configurations are incompatible with swarm mode")
}
if config.LiveRestore {