kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity
28331 commits 10 branches 356 tags 299 MiB
Commit graph

3 commits

Author SHA1 Message Date
John Howard
02309170a5 Remove hacked Windows OCI spec, compile fixups 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-27 12:07:35 -07:00
Yong Tang
7d705a7355 Fix ulimits in docker inspect when daemon default exists 
This fix tries to fix 26326 where `docker inspect` will not show
ulimit even when daemon default ulimit has been set.

This fix merge the HostConfig's ulimit with daemon default in
`docker inspect`, so that when daemon is started with `default-ulimit`
and HostConfig's ulimit is not set, `docker inspect` will output
the daemon default.

An integration test has been added to cover the changes.

This fix fixes 26326.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-07 23:15:22 -07:00
Amit Krishnan
86d8758e2b Get the Docker Engine to build clean on Solaris 
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
 2016-05-23 16:37:12 -07:00