Files
docker-cli/components/engine/docs/reference/commandline
Lei Jitang ba3d7fd0c4 Fix configuration reloading
There are five options 'debug' 'labels' 'cluster-store' 'cluster-store-opts'
and 'cluster-advertise' that can be reconfigured, configure any of these
options should not affect other options which may have configured in flags.
But this is not true, for example, I start a daemon with -D to enable the
debugging, and after a while, I want reconfigure the 'label', so I add a file
'/etc/docker/daemon.json' with content '"labels":["test"]' and send SIGHUP to daemon
to reconfigure the daemon, it work, but the debugging of the daemon is also diabled.
I don't think this is a expeted behaviour.
This patch also have some minor refactor of reconfiguration of cluster-advertiser.
Enable user to reconfigure cluster-advertiser without cluster-store in config file
since cluster-store could also be already set in flag, and we only want to reconfigure
the cluster-advertiser.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: b9366c9609166d41e987608041b5a2079726aa5f
Component: engine
2016-02-24 21:12:14 -05:00
..
2016-02-05 16:47:57 -05:00
2016-01-20 09:18:20 +00:00
2016-02-05 16:47:57 -05:00
2016-02-19 09:27:03 +08:00
2016-02-19 09:27:03 +08:00
2016-01-14 08:44:41 -08:00
2016-02-24 21:12:14 -05:00
2015-06-15 13:19:38 -07:00
2016-02-19 09:27:03 +08:00
2016-01-03 23:03:39 +01:00
2016-01-26 15:58:53 -08:00
2016-02-02 12:28:33 +00:00
2016-02-19 09:27:03 +08:00
2016-01-26 15:58:53 -08:00
2016-01-22 09:27:53 +02:00
2016-02-02 12:28:33 +00:00
2016-02-11 15:49:36 -08:00
2016-02-23 16:10:54 +00:00
2016-01-13 21:28:52 -08:00
2016-02-19 09:27:03 +08:00
2016-02-19 09:27:03 +08:00
2016-01-21 04:26:49 +00:00
2016-02-23 12:10:24 -05:00
2016-02-19 09:27:03 +08:00
2016-02-02 12:28:33 +00:00
2016-02-15 13:17:05 -08:00
2016-01-26 15:58:53 -08:00
2016-01-03 23:03:39 +01:00
2016-01-26 15:58:53 -08:00
2016-02-20 17:06:32 +08:00
2016-02-18 21:52:15 +02:00
2016-02-18 21:52:15 +02:00