Signed-off-by: Michael Crosby <crosbymichael@gmail.com> Conflicts: pkg/archive/archive.go pkg/chrootarchive/archive.go Conflicts: pkg/archive/archive.go Upstream-commit: 001ac15b54686761960352103ebf4ff2c6e1d803 Component: engine
Signed-off-by: Michael Crosby <crosbymichael@gmail.com> Conflicts: pkg/archive/archive.go pkg/chrootarchive/archive.go Conflicts: pkg/archive/archive.go Upstream-commit: 001ac15b54686761960352103ebf4ff2c6e1d803 Component: engine