Merge pull request #13359 from davidxia/increase-docker-kill-timeout

Increase upstart kill timeout to 20 seconds
Upstream-commit: 76a5fb3e1e329bf38ee6aca29bbe6f3b1b8188c6
Component: engine

components/engine/contrib/init/upstart/docker.conf

@@ -7,6 +7,8 @@ limit nproc 524288 1048576
 
 respawn
 
+kill timeout 20
+
 pre-start script
 	# see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
 	if grep -v '^#' /etc/fstab | grep -q cgroup \