Brian Goff 75e47b0eb6 Merge pull request #36874 from kolyshkin/stop-timeout ...

daemon.ContainerStop(): fix for a negative timeout
Upstream-commit: b85799b63fb25423620ed16e717a99401cd3a39b
Component: engine

2018-05-30 13:38:42 -04:00

..

build

Adjust API version to match correct release

2018-05-24 02:39:56 +02:00

config

Various code-cleanup

2018-05-23 17:50:54 +02:00

container

Merge pull request #36874 from kolyshkin/stop-timeout

2018-05-30 13:38:42 -04:00

image

Replace deprecated testutil.ErrorContains()

2018-05-21 00:13:04 +02:00

internal

Some slight tweaks for the integration test

2018-05-21 10:08:27 +08:00

network

Add t.Name() to tests so that service names are unique

2018-05-28 22:57:52 +00:00

plugin

more fixes on integration

2018-05-22 11:25:25 -07:00

secret

Various code-cleanup

2018-05-23 17:50:54 +02:00

service

Fix some linting issues

2018-05-17 19:28:27 +02:00

session

Move integration-cli/request to internal/test/request…

2018-04-17 16:25:59 +02:00

system

fix and skip some tests based on API version

2018-05-15 16:05:04 -07:00

testdata/https

integration/plugin/authz: port tests from integration-cli

2017-10-02 14:20:59 +01:00

volume

Replace deprecated testutil.ErrorContains()

2018-05-21 00:13:04 +02:00

doc.go

Add canonical import comment

2018-02-05 16:51:57 -05:00