admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into s2ibin-upload

Browse Source 
Signed-off-by: runzexia <runzexia@yunify.com>

# Conflicts:
#	vendor/modules.txt
This commit is contained in:
runzexia
2019-09-02 15:21:38 +08:00
parent 1a513a9aa3 6ba27c5e4d
commit 3156362f6c
23 changed files with 1195 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -78,7 +78,7 @@ require (
github.com/knative/pkg v0.0.0-20190314204845-cd278f2d3394
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/kubernetes-sigs/application v0.0.0-20190404151855-67ae7f915d4e
github.com/kubesphere/s2ioperator v0.0.12
github.com/kubesphere/s2ioperator v0.0.13
github.com/kubesphere/sonargo v0.0.2
github.com/leodido/go-urn v1.1.0 // indirect
github.com/lib/pq v1.2.0 // indirect