Brian Goff 10deb56947 Merge pull request #26405 from yongtang/26326-inspect-ulimit-with-daemon-default ...

Fix Ulimits in `docker inspect` when daemon default exists
Upstream-commit: ba07661f0d6ae6b1b0d2e7271a8c8933bcc15364
Component: engine

2016-09-08 13:21:26 -04:00

components/engine

Merge pull request #26405 from yongtang/26326-inspect-ulimit-with-daemon-default

2016-09-08 13:21:26 -04:00

Description

No description provided

310 MiB

Languages

Go 92%

Shell 5.5%

Dockerfile 1.1%

Go-Checksums 0.9%

Makefile 0.3%

Other 0.2%