Revendor teleport. (#504)

* Revendor teleport. * Bump satellite to 5.5.4.
gravitational · Jul 15, 2019 · b5a0165 · b5a0165
1 parent 55c1387
commit b5a0165
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 12 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -64,7 +64,7 @@ ignored = [
 
 [[constraint]]
   name = "github.com/gravitational/satellite"
-  version = "=5.5.2"
+  version = "=5.5.4"
 
 [[constraint]]
   name = "github.com/xtgo/set"

diff --git a/vendor/github.com/gravitational/satellite/agent/proto/agentpb/timestamp.go b/vendor/github.com/gravitational/satellite/agent/proto/agentpb/timestamp.go
diff --git a/vendor/github.com/gravitational/satellite/monitoring/defaults_linux.go b/vendor/github.com/gravitational/satellite/monitoring/defaults_linux.go
diff --git a/vendor/github.com/gravitational/satellite/monitoring/dns.go b/vendor/github.com/gravitational/satellite/monitoring/dns.go
diff --git a/vendor/github.com/gravitational/teleport/lib/web/apiserver.go b/vendor/github.com/gravitational/teleport/lib/web/apiserver.go