Merge branch 'master' into crd-gen

Signed-off-by: runzexia <runzexia@yunify.com> # Conflicts: # go.mod # go.sum
2019-07-31 11:31:41 +08:00
parent de7fc0819f d713cb316a
commit 34ddd34944
221 changed files with 16630 additions and 39 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,9 @@ go:
  - "1.12.x"
 env:
  - GO111MODULE=on
+cache:
+  directories:
+    - $HOME/gopath/pkg/mod

 before_script:
  - docker --version