Resolved merge conflict

Signed-off-by: hongming <talonwan@yunify.com>
2019-04-08 22:54:51 +08:00
parent 93ad572e19 d01cdf3b3c
commit c4c021b5a2
327 changed files with 64018 additions and 406 deletions
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -57,7 +57,7 @@ required = [

 [[constraint]]
  name="github.com/kubesphere/s2ioperator"
-  version="v0.0.7"
+  version="v0.0.8"

 [[override]]
  name="github.com/bifurcation/mint"
@@ -107,7 +107,8 @@ required = [

 [[constraint]]
  name = "github.com/kiali/kiali"
-  version = "0.15.0"
+  source = "https://github.com/kubesphere/kiali"
+  branch = "kubesphere"

 [[constraint]]
  name = "github.com/gorilla/mux"