Merge pull request #31029 from BSWANG/master

fix docker daemon reload bug
This commit is contained in:
Vincent Demeester 2017-02-15 10:06:18 +01:00 committed by GitHub
commit ed003ffbe5

View file

@ -1160,7 +1160,7 @@ func (daemon *Daemon) reloadClusterDiscovery(conf *config.Config) error {
}
// check discovery modifications
if !config.ModifiedDiscoverySettings(daemon.configStore, newAdvertise, newClusterStore, conf.ClusterOpts) {
if !config.ModifiedDiscoverySettings(daemon.configStore, newClusterStore, newAdvertise, conf.ClusterOpts) {
return nil
}