better merge of values

2019-10-19 15:08:41 +11:00
parent 840824d438
commit fec03e0a7e
5 changed files with 275 additions and 416 deletions
--- a/go.mod
+++ b/go.mod
@ -3,30 +3,24 @@ module novit.nc/direktil/local-server
 require (
 	github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e
 	github.com/cloudflare/cfssl v0.0.0-20181213083726-b94e044bb51e
-	github.com/emicklei/go-restful v2.8.1+incompatible
-	github.com/emicklei/go-restful-openapi v1.0.0
-	github.com/go-openapi/jsonpointer v0.18.0 // indirect
-	github.com/go-openapi/jsonreference v0.18.0 // indirect
-	github.com/go-openapi/spec v0.18.0 // indirect
-	github.com/go-openapi/swag v0.18.0 // indirect
-	github.com/gobuffalo/envy v1.6.15 // indirect
-	github.com/gobuffalo/packd v0.0.0-20190315122247-83d601d65093 // indirect
-	github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754 // indirect
+	github.com/emicklei/go-restful v2.10.0+incompatible
+	github.com/emicklei/go-restful-openapi v1.2.0
+	github.com/frankban/quicktest v1.5.0 // indirect
+	github.com/go-openapi/jsonreference v0.19.3 // indirect
+	github.com/go-openapi/spec v0.19.3 // indirect
+	github.com/golang/protobuf v1.3.2 // indirect
 	github.com/google/certificate-transparency-go v1.0.21 // indirect
-	github.com/json-iterator/go v1.1.5 // indirect
-	github.com/mcluseau/go-swagger-ui v0.0.0-20190204031917-596bc3a55ffd
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/mailru/easyjson v0.7.0 // indirect
+	github.com/mcluseau/go-swagger-ui v0.0.0-20191019002626-fd9128c24a34
 	github.com/oklog/ulid v1.3.1
-	github.com/pierrec/lz4 v2.0.5+incompatible
-	github.com/rogpeppe/go-internal v1.2.2 // indirect
-	golang.org/x/net v0.0.0-20190311183353-d8887717615a // indirect
-	golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 // indirect
-	golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 // indirect
-	gopkg.in/src-d/go-billy.v4 v4.3.0
-	gopkg.in/src-d/go-git.v4 v4.10.0
+	github.com/pierrec/lz4 v2.3.0+incompatible
+	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
+	golang.org/x/net v0.0.0-20191014212845-da9a3fd4c582 // indirect
+	golang.org/x/sys v0.0.0-20191018095205-727590c5006e // indirect
+	gopkg.in/src-d/go-billy.v4 v4.3.2
+	gopkg.in/src-d/go-git.v4 v4.13.1
 	gopkg.in/yaml.v2 v2.2.4
-	k8s.io/apimachinery v0.0.0-20190201131811-df262fa1a1ba
+	k8s.io/apimachinery v0.0.0-20191017185446-6e68a40eebf9
 	novit.nc/direktil/pkg v0.0.0-20191009054056-6e432c2a06e6
 )