Alexander Morozov 770410c730 Merge pull request #30749 from yongtang/28005-docker-stats-header-windows ...

Fix Windows `docker stats` showing Linux headers
Upstream-commit: 90709776c5a78bcfab226c19ccb6fa21c3f272f6
Component: engine

2017-02-06 14:09:23 -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

Fix Windows docker stats showing Linux headers

2017-02-05 08:55:30 -08:00

formatter

Fix Windows docker stats showing Linux headers

2017-02-05 08:55:30 -08:00

idresolver

service ps: Truncate Task IDs

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

image

Merge pull request #29692 from yongtang/29492-daemon-shm-size

2017-02-01 16:56:10 +01:00

inspect

Move templates to pkg/templates

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

network

Add version annotation to various flags added in 1.13

2017-01-16 18:21:20 +01:00

node

Add some unit tests to the node and swarm cli code

2017-01-09 18:30:15 +01:00

plugin

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

2017-02-06 09:13:07 -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 #30180 from allencloud/add-endpoint-mode-a-default-value

2017-02-02 11:51:44 -08:00

stack

Add --format to docker service ls

2017-02-01 08:33:19 -08:00

swarm

Add version annotation to various flags added in 1.13

2017-01-16 18:21:20 +01:00

system

return error when listNode fails

2017-01-19 14:02:06 +08:00

task

Add some unit tests to the node and swarm cli code

2017-01-09 18:30:15 +01:00

volume

Merge pull request #26830 from dnephin/man-desc-in-files

2017-01-03 17:47:49 +01:00

cli.go

Add some unit tests to the node and swarm cli code

2017-01-09 18:30:15 +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