1
0
Fork 0

Merge branch v2.6 into v2.7

This commit is contained in:
Tom Moulard 2022-04-21 10:59:46 +02:00
commit 73ba7ed2d2
No known key found for this signature in database
GPG key ID: 521ABE0C1A0DEAF6
145 changed files with 1187 additions and 502 deletions

4
go.mod
View file

@ -61,7 +61,7 @@ require (
github.com/stvp/go-udp-testing v0.0.0-20191102171040-06b61409b154
github.com/tinylib/msgp v1.0.2 // indirect
github.com/traefik/paerser v0.1.5
github.com/traefik/yaegi v0.11.2
github.com/traefik/yaegi v0.11.3
github.com/uber/jaeger-client-go v2.29.1+incompatible
github.com/uber/jaeger-lib v2.2.0+incompatible
github.com/unrolled/render v1.0.2
@ -95,7 +95,7 @@ replace (
github.com/go-check/check => github.com/containous/check v0.0.0-20170915194414-ca0bf163426a
github.com/gorilla/mux => github.com/containous/mux v0.0.0-20220113180107-8ffa4f6d063c
github.com/mailgun/minheap => github.com/containous/minheap v0.0.0-20190809180810-6e71eb837595
github.com/mailgun/multibuf => github.com/containous/multibuf v0.0.0-20190809014333-8b6c9a7e6bba
github.com/mailgun/multibuf => github.com/containous/multibuf v0.0.0-20220419123348-2d0b12e116c6
)
// https://github.com/docker/compose/blob/e44222664abd07ce1d1fe6796d84d93cbc7468c3/go.mod#L131