Merge pull request #1 from containernetworking/master

update upstream
f1-outsourcing · Jul 24, 2019 · ab93357 · ab93357
2 parents 3c9808f + ded2f17
commit ab93357
Show file tree

Hide file tree

Showing 941 changed files with 37,777 additions and 265,505 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,14 +3,15 @@ sudo: required
 dist: trusty
 
 go:
-  - 1.10.x
   - 1.11.x
+  - 1.12.x
 
 env:
   global:
   - PATH=$GOROOT/bin:$GOPATH/bin:$PATH
   - CGO_ENABLED=0
   matrix:
+  - TARGET=386
   - TARGET=amd64
   - TARGET=arm
   - TARGET=arm64
@@ -22,10 +23,10 @@ matrix:
   include:
     - os: windows
       env: TARGET=amd64
-      go: 1.10.x
+      go: 1.11.x
     - os: windows
       env: TARGET=amd64
-      go: 1.11.x
+      go: 1.12.x
 
 install:
   - go get github.com/onsi/ginkgo/ginkgo

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json