summaryrefslogtreecommitdiff
path: root/vendor/github.com/Microsoft/hcsshim/container.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-05-20 06:01:20 -0400
committerGitHub <noreply@github.com>2021-05-20 06:01:20 -0400
commit49a99be5b6bd50aa0e7b4cf53ec042b0ffd9edf2 (patch)
tree264fcf52a0a7233e4d824d4171c55be599c3c0fb /vendor/github.com/Microsoft/hcsshim/container.go
parentcb937f4aa89abc3758bcc761839d3044d194b936 (diff)
parent898a8ad28514f90e13b05707a0ead148caa33541 (diff)
downloadpodman-49a99be5b6bd50aa0e7b4cf53ec042b0ffd9edf2.tar.gz
podman-49a99be5b6bd50aa0e7b4cf53ec042b0ffd9edf2.tar.bz2
podman-49a99be5b6bd50aa0e7b4cf53ec042b0ffd9edf2.zip
Merge pull request #10377 from vrothberg/test-common
update c/common
Diffstat (limited to 'vendor/github.com/Microsoft/hcsshim/container.go')
-rw-r--r--vendor/github.com/Microsoft/hcsshim/container.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/github.com/Microsoft/hcsshim/container.go b/vendor/github.com/Microsoft/hcsshim/container.go
index 7205a62c5..bfd722898 100644
--- a/vendor/github.com/Microsoft/hcsshim/container.go
+++ b/vendor/github.com/Microsoft/hcsshim/container.go
@@ -8,8 +8,8 @@ import (
"time"
"github.com/Microsoft/hcsshim/internal/hcs"
+ "github.com/Microsoft/hcsshim/internal/hcs/schema1"
"github.com/Microsoft/hcsshim/internal/mergemaps"
- "github.com/Microsoft/hcsshim/internal/schema1"
)
// ContainerProperties holds the properties for a container and the processes running in that container