4 commits

Author	SHA1	Message	Date
Yanqiang Miao	87d0a3ad89	The returned err should be printed ... Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>	2017-03-29 09:00:50 +08:00
Yanqiang Miao	fb2bc35210	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>	2017-03-27 10:07:58 +08:00
fate-grand-order	2a8d6368d4	use t.Fatal() to output the err message where the values used for formatting ... text does not appear to contain a placeholder Signed-off-by: Helen Xie <chenjg@harmonycloud.cn>	2017-02-23 10:16:22 +08:00
Vincent Demeester	db63f9370e	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>	2017-02-08 09:53:38 +01:00