From 71620c0f0e2cdddffaebeb0305bdfb91bf2e100c Mon Sep 17 00:00:00 2001 From: Andrew Martinez Date: Fri, 4 Jun 2021 12:40:30 -0400 Subject: [PATCH 1/2] deps and log --- CHANGELOG.md | 6 ++++++ go.mod | 4 ++-- go.sum | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba12f6707..775666176 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Release 0.20.6 + +## What's New + +* Bug fix: Revert defensive Edge Router disconnect protection in Edge + # Release 0.20.5 ## What's New diff --git a/go.mod b/go.mod index 2bbb8eec1..9be25b556 100644 --- a/go.mod +++ b/go.mod @@ -29,8 +29,8 @@ require ( github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.3.7 - github.com/openziti/edge v0.19.123 - github.com/openziti/fabric v0.16.64 + github.com/openziti/edge v0.19.125 + github.com/openziti/fabric v0.16.65 github.com/openziti/foundation v0.15.53 github.com/openziti/sdk-golang v0.15.50 github.com/pborman/uuid v1.2.0 diff --git a/go.sum b/go.sum index 01f94a1a2..c8be9053b 100644 --- a/go.sum +++ b/go.sum @@ -617,8 +617,13 @@ github.com/openziti/dilithium v0.3.3 h1:PLgQ6PMNLSTzCFbX/h98cmudgz/cU6TmjdSv5NAP github.com/openziti/dilithium v0.3.3/go.mod h1:vsCjI2AU/hon9e+dLhUFbCNGesJDj2ASgkySOcpmvjo= github.com/openziti/edge v0.19.123 h1:R/fvyx+TDwIDGMdGQ5rzh4ucvnkCHg7yPDnzQfITzfU= github.com/openziti/edge v0.19.123/go.mod h1:8Ey1EI9iMITrk46ZpMGp7BaPkNzpTbvbdkoAzFOI9tY= +github.com/openziti/edge v0.19.124 h1:HLRiRGRqqjift/umS7MyslNZ8ntfu1FiRAkpT58SZ+g= +github.com/openziti/edge v0.19.124/go.mod h1:/VClO3WzLkTYA5iLISn7hlVL8hGrLllU4VoU3meonbg= +github.com/openziti/edge v0.19.125 h1:NPPK24NbdZrlYW1lIPwreChKmlTreV8JX/4l56Rknv8= +github.com/openziti/edge v0.19.125/go.mod h1:/VClO3WzLkTYA5iLISn7hlVL8hGrLllU4VoU3meonbg= github.com/openziti/fabric v0.16.64 h1:arJPbmAzTJ0nF3jCyYU6AH4J94QXoz0uHYMErKssMgc= github.com/openziti/fabric v0.16.64/go.mod h1:WX5RRBP4jEMaF9R7yHK/q2C+qFuzgN7k/Y97tfO5XQE= +github.com/openziti/fabric v0.16.65/go.mod h1:WX5RRBP4jEMaF9R7yHK/q2C+qFuzgN7k/Y97tfO5XQE= github.com/openziti/foundation v0.15.52/go.mod h1:NnSBTp9ZkcYsv6nYxZR0/NzoHfkIo6tjpBHDvBsPFqw= github.com/openziti/foundation v0.15.53 h1:r5DTm1G/L6thdKAVjnh58RrksOSlN+9hcvzFoecGezI= github.com/openziti/foundation v0.15.53/go.mod h1:h8d47dCV3vgwAkY4pkQrgpu3wBblDwUrNb/uvDAs0sU= From ef8732bd7ad7c35dbfd7e52f47cc6770e0c54eee Mon Sep 17 00:00:00 2001 From: Andrew Martinez Date: Fri, 4 Jun 2021 13:29:22 -0400 Subject: [PATCH 2/2] downgrade fabric to .64 --- go.mod | 4 ++-- go.sum | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 9be25b556..6b9a3031d 100644 --- a/go.mod +++ b/go.mod @@ -29,8 +29,8 @@ require ( github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.3.7 - github.com/openziti/edge v0.19.125 - github.com/openziti/fabric v0.16.65 + github.com/openziti/edge v0.19.126 + github.com/openziti/fabric v0.16.64 github.com/openziti/foundation v0.15.53 github.com/openziti/sdk-golang v0.15.50 github.com/pborman/uuid v1.2.0 diff --git a/go.sum b/go.sum index c8be9053b..cced6a3b4 100644 --- a/go.sum +++ b/go.sum @@ -615,15 +615,10 @@ github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e h1:ST9+54UtCr96S5 github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= github.com/openziti/dilithium v0.3.3 h1:PLgQ6PMNLSTzCFbX/h98cmudgz/cU6TmjdSv5NAPD8k= github.com/openziti/dilithium v0.3.3/go.mod h1:vsCjI2AU/hon9e+dLhUFbCNGesJDj2ASgkySOcpmvjo= -github.com/openziti/edge v0.19.123 h1:R/fvyx+TDwIDGMdGQ5rzh4ucvnkCHg7yPDnzQfITzfU= -github.com/openziti/edge v0.19.123/go.mod h1:8Ey1EI9iMITrk46ZpMGp7BaPkNzpTbvbdkoAzFOI9tY= -github.com/openziti/edge v0.19.124 h1:HLRiRGRqqjift/umS7MyslNZ8ntfu1FiRAkpT58SZ+g= -github.com/openziti/edge v0.19.124/go.mod h1:/VClO3WzLkTYA5iLISn7hlVL8hGrLllU4VoU3meonbg= -github.com/openziti/edge v0.19.125 h1:NPPK24NbdZrlYW1lIPwreChKmlTreV8JX/4l56Rknv8= -github.com/openziti/edge v0.19.125/go.mod h1:/VClO3WzLkTYA5iLISn7hlVL8hGrLllU4VoU3meonbg= +github.com/openziti/edge v0.19.126 h1:NYpoePBshu9RWMOJeweHZV+gsPSinD+i2oRD4V94fgY= +github.com/openziti/edge v0.19.126/go.mod h1:8Ey1EI9iMITrk46ZpMGp7BaPkNzpTbvbdkoAzFOI9tY= github.com/openziti/fabric v0.16.64 h1:arJPbmAzTJ0nF3jCyYU6AH4J94QXoz0uHYMErKssMgc= github.com/openziti/fabric v0.16.64/go.mod h1:WX5RRBP4jEMaF9R7yHK/q2C+qFuzgN7k/Y97tfO5XQE= -github.com/openziti/fabric v0.16.65/go.mod h1:WX5RRBP4jEMaF9R7yHK/q2C+qFuzgN7k/Y97tfO5XQE= github.com/openziti/foundation v0.15.52/go.mod h1:NnSBTp9ZkcYsv6nYxZR0/NzoHfkIo6tjpBHDvBsPFqw= github.com/openziti/foundation v0.15.53 h1:r5DTm1G/L6thdKAVjnh58RrksOSlN+9hcvzFoecGezI= github.com/openziti/foundation v0.15.53/go.mod h1:h8d47dCV3vgwAkY4pkQrgpu3wBblDwUrNb/uvDAs0sU=