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