p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #23344 from pdalpra/timeout-as-time.Duration

Browse Source 
Timeout as time.duration
Upstream-commit: 6fd8c96f6164fa70170a2400f8fa092de9507cf9
Component: engine
This commit is contained in:
Brian Goff
2016-06-08 16:37:08 -04:00
parent 6c2f2ddb74 2193b7f2c7
commit ecac3fcd79
9 changed files with 67 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/hack/vendor.sh
View File

@ -60,7 +60,7 @@ clone git golang.org/x/net 2beffdc2e92c8a3027590f898fe88f69af48a3f8 https://gith
clone git golang.org/x/sys eb2c74142fd19a79b3f237334c7384d5167b1b46 https://github.com/golang/sys.git
clone git github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3
clone git github.com/docker/go-connections v0.2.0
clone git github.com/docker/engine-api 772250a752e34cacaeef7c92b8e0ddf43450b629
clone git github.com/docker/engine-api 8c2141e14bb9e7540938d155976b3ef0661e4814
clone git github.com/RackSec/srslog 259aed10dfa74ea2961eddd1d9847619f6e98837
clone git github.com/imdario/mergo 0.2.1