Merge branch 'master' into v1.5.2
Showing
... | ... | @@ -27,7 +27,7 @@ require ( |
github.com/google/go-cmp v0.3.0 | ||
github.com/gorilla/mux v1.7.1 // indirect | ||
github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce // indirect | ||
github.com/hashicorp/go-getter v1.3.0 | ||
github.com/hashicorp/go-getter v1.4.0 | ||
github.com/hashicorp/go-multierror v0.0.0-20160811015721-8c5f0ad93604 // indirect | ||
github.com/hashicorp/go-retryablehttp v0.5.4 | ||
github.com/hooklift/assert v0.0.0-20170704181755-9d1defd6d214 // indirect | ||
... | ... | @@ -87,6 +87,7 @@ require ( |
replace ( | ||
git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 | ||
github.com/docker/machine => github.com/machine-drivers/machine v0.7.1-0.20190910053320-21bd2f51b8ea | ||
github.com/hashicorp/go-getter => github.com/afbjorklund/go-getter v1.4.1-0.20190910175809-eb9f6c26742c | ||
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20190623232353-8c3b7d7679cc | ||
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190623232353-8c3b7d7679cc | ||
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20190623232353-8c3b7d7679cc | ||
... | ... |
想要评论请 注册 或 登录