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

..

bundlefile

Reinstate --bundle-file argument to 'docker deploy'

2016-11-10 11:28:18 -05:00

checkpoint

Print checkpoint id when creating a checkpoint

2016-12-01 23:30:14 -05:00

commands

Give a order to AddCommands, for easy read and maintenance.

2016-12-08 16:43:14 +08:00

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

service ps: Truncate Task IDs

2016-11-08 16:17:15 -08:00

image

Add --add-host for docker build

2017-02-20 17:32:28 -05:00

inspect

Move templates to pkg/templates

2016-12-12 09:34:03 +01:00

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

Add --filter until=<timestamp> for docker container/image prune

2017-01-04 14:16:42 -08:00

registry

change minor mistake of spelling

2016-12-20 21:05:19 +08:00

secret

remove cli/command/secrets/utils.go

2017-01-29 13:32:49 +08:00

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

Add subcommand prune to the container, volume, image and system commands

2016-09-29 07:42:53 -07:00

in.go

Fix the incorrect description for NewInStream

2016-10-13 22:33:09 +08:00

out.go

Windows: OCI process struct convergence

2016-09-19 10:34:31 -07:00

registry.go

Remove use of forked reference package for cli

2017-01-19 16:04:50 -08:00

trust.go

fix flag descriptions for content-trust

2017-01-23 14:52:36 +01:00

utils.go

Fix "command.PromptForConfirmation" to accept "enter" for the "N" default

2017-02-06 09:13:07 -08:00