Signed-off-by: Lantao Liu <lantaol@google.com>
(cherry picked from commit 18be6e3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Signed-off-by: Lantao Liu <lantaol@google.com>
(cherry picked from commit 0bb48ae)
Signed-off-by: Ameya Gawde <ameya.gawde@docker.com>

[release/1.3]  Add `--log-file` flag for windows service.

A race occurs today where the cleanup runs after the lease
has been deleted, making all the content and statuses
eligible for collection during the cleanup. There is a case
where a status could be listed but removed before the
abort is called. In this case, abort will return a not found
and the test cleanup should ignore it.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
(cherry picked from commit 8da4346)
Signed-off-by: Wei Fu <fuweid89@gmail.com>

[release 1.3] Fix cleanup error on content client test

…y_runc_state

[release/1.3 backport] Use cached state instead of `runc state`.

Signed-off-by: Lantao Liu <lantaol@google.com>

[release/1.3] Fix container pid.

Signed-off-by: Lantao Liu <lantaol@google.com>

[release/1.3] Update cri to b1bef15fbeb6c6f0569b67322acfa74ca3597755.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>

[release/1.3] Prepare v1.3.2 release