Antonio Murdaca 1ca660e3b7 Merge pull request #512 from runcom/stop-timeout ... server: honor container stop timeout from CRI		2017-05-16 10:06:47 +02:00
..
crio	Fix remnants of ocid -> crio rename	2017-05-15 15:05:58 -07:00
crioctl	server: honor container stop timeout from CRI	2017-05-15 22:56:31 +02:00
kpod	Rename ocid to crio.	2017-05-12 09:56:06 -04:00