Yong Tang f2197b6794 Fix error caused by overlapping merge of 30733 ... This fix fixes build error caused by overlapping merge of 30733 and 28213. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>		2017-03-03 13:26:00 -08:00
..
bundlefile	…
checkpoint	…
commands	…
container	Merge pull request #31212 from fate-grand-order/fixed	2017-02-27 12:26:35 +09:00
formatter	Fix error caused by overlapping merge of 30733	2017-03-03 13:26:00 -08:00
idresolver	…
image	Add --add-host for docker build	2017-02-20 17:32:28 -05:00
inspect	…
network	why there are so many mistakes in our repo (up to /cmd)	2017-02-17 00:32:48 +08:00
node	Delete dots to align with other commands description	2017-02-23 16:46:08 +08:00
plugin	Use distribution reference	2017-02-07 11:08:37 -08:00
prune	…
registry	…
secret	…
service	Merge pull request #30725 from aaronlehmann/topology	2017-03-03 15:01:12 +01:00
stack	Merge pull request #28213 from yongtang/11062016-service-ps-format	2017-02-17 10:23:18 -08:00
swarm	Merge pull request #30814 from YuPengZTE/devSwarmCliExplain	2017-02-21 00:59:58 +01:00
system	'docker daemon' deprecation message doesn't use the new versioning scheme	2017-03-03 17:26:49 +08:00
task	Add `--format` to `docker service ps`	2017-02-10 16:53:04 -08:00
volume	Add unit tests to cli/command/volume package	2017-02-27 18:39:35 +01:00
cli.go	Add unit tests to cli/command/volume package	2017-02-27 18:39:35 +01:00
events_utils.go	…
in.go	…
out.go	…
registry.go	…
trust.go	…
utils.go	…