[7.0] Remove CONFIG_NF_NAT_IPV4 check (#796)

* Revendor satellite * Bump satellite to 7.0.24.
gravitational · Nov 19, 2020 · 1b19f1d · 1b19f1d
1 parent 1701afb
commit 1b19f1d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -94,7 +94,7 @@ ignored = ["github.com/gravitational/planet/build/*"]
 
 [[constraint]]
  name = "github.com/gravitational/satellite"
- version = "=7.0.23"
+ version = "=7.0.24"
 
 [[override]]
  name = "github.com/gravitational/trace"

diff --git a/vendor/github.com/gravitational/satellite/monitoring/defaults_linux.go b/vendor/github.com/gravitational/satellite/monitoring/defaults_linux.go