Merge branch '1.4'

This commit is contained in:
Bryan Boreham committed 2016-01-21 10:18:01 +00:00
commit 7ec17ab2ef
2 files changed
+5 -1

No files matched your search

+4
View File
@@ -22,6 +22,10 @@ func (i *inspectExecInterceptor) InterceptResponse(r *http.Response) error {
return err
}
if _, ok := exec["Container"]; !ok {
return nil
}
container, err := exec.Object("Container")
if err != nil {
return err