Signed-off-by: Daniel Nephin <dnephin@docker.com> Upstream-commit: 4f0d95fa6ee7f865597c03b9e63702cdcb0f7067 Component: engine
Signed-off-by: John Howard <jhoward@microsoft.com> Conflicts: pkg/archive/copy.go Make it compile Signed-off-by: John Howard <jhoward@microsoft.com> Upstream-commit: 2a237615c0915b60b8dc6c13a377bb766780ecbf Component: engine