Yong Tang 146a801e5a 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>
Upstream-commit: f2197b679401627610a7efc8adb9ddc27b5af02f
Component: engine

2017-03-03 13:26:00 -08:00

..

command

Fix error caused by overlapping merge of 30733

2017-03-03 13:26:00 -08:00

compose

Merge pull request #31088 from xulike666/make-code-readable-again

2017-02-16 22:04:27 -05:00

config

Merge pull request #28213 from yongtang/11062016-service-ps-format

2017-02-17 10:23:18 -08:00

debug

Move debug functions to cli/debug package

2016-12-12 09:33:58 +01:00

flags

fix the type

2017-02-14 09:54:27 +08:00

internal/test

Add unit tests to cli/command/volume package

2017-02-27 18:39:35 +01:00

trust

Use distribution reference

2017-02-07 11:08:37 -08:00

cobra.go

Wrap output of docker cli --help

2017-02-03 11:05:49 +00:00

error.go

Remove old cli framework.

2016-08-25 13:09:04 -04:00

required.go

fix typos

2016-07-05 20:42:17 +08:00