3 Commits

Author	SHA1	Message	Date
Daniel Nephin	ae03b006a6	Fix merge conflict ... Signed-off-by: Daniel Nephin <dnephin@docker.com>	2018-01-22 18:09:47 -05:00
Daniel Nephin	bace33d7a8	Fix TestAttachExitCode ... Signed-off-by: Daniel Nephin <dnephin@docker.com>	2017-11-17 18:12:48 -08:00
Kenfe-Mickael Laventure	66661761d5	attach: Use ContainerWait instead of Inspect ... Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>	2017-11-17 18:12:46 -08:00