5 Commits

Include renames

Author	SHA1	Message	Date
Daniel Nephin	be83c11fb0	Add canonical import comment ... Signed-off-by: Daniel Nephin <dnephin@docker.com> Upstream-commit: 4f0d95fa6ee7f865597c03b9e63702cdcb0f7067 Component: engine	2018-02-05 16:51:57 -05:00
Derek McGowan	d659edcaf5	Update logrus to v1.0.1 ... Fixes case sensitivity issue Signed-off-by: Derek McGowan <derek@mcgstyle.net> Upstream-commit: 1009e6a40b295187e038b67e184e9c0384d95538 Component: engine	2017-07-31 13:16:46 -07:00
Yanqiang Miao	c3332b9e26	The returned err should be printed ... Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn> Upstream-commit: 87d0a3ad890ea0d12f5e7b28f34ea835048696bd Component: engine	2017-03-29 09:00:50 +08:00
Yanqiang Miao	92497be019	The variable heartbeat might be 0 ... Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn> perfect the test case for 'discoveryOpts' Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn> Upstream-commit: fb2bc3521069b55bbb342305e533e78682fbcc65 Component: engine	2017-03-27 10:07:58 +08:00
Vincent Demeester	dd8010e320	Extract daemon configuration and discovery to their own package ... This also moves some cli specific in `cmd/dockerd` as it does not really belong to the `daemon/config` package. Signed-off-by: Vincent Demeester <vincent@sbr.pm> Upstream-commit: db63f9370e26d725357c703cbaf9ab63cc7b6d0a Component: engine	2017-02-08 09:53:38 +01:00