feat: merge master

This commit is contained in:
Fabiennne
2020-03-30 17:51:25 +02:00
parent 85aa907d12
commit 108876348f
12 changed files with 10 additions and 29 deletions

3
go.mod
View File

@@ -11,6 +11,7 @@ require (
github.com/Masterminds/sprig v2.22.0+incompatible
github.com/aws/aws-sdk-go v1.29.16 // indirect
github.com/caos/logging v0.0.1
github.com/envoyproxy/protoc-gen-validate v0.1.0
github.com/ghodss/yaml v1.0.0
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/mock v1.4.3
@@ -34,7 +35,7 @@ require (
golang.org/x/text v0.3.2
golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56
google.golang.org/api v0.20.0 // indirect
google.golang.org/genproto v0.0.0-20200319113533-08878b785e9c // indirect
google.golang.org/genproto v0.0.0-20200319113533-08878b785e9c
google.golang.org/grpc v1.28.0
gopkg.in/yaml.v2 v2.2.8 // indirect
)