Merge pull request #18423 from rajatchopra/cmux_glide

Automatic merge from submit-queue (batch tested with PRs 18423, 18255, 18526, 18539, 18509). update github.com/cockroachdb/cmux for bz1532060 For https://bugzilla.redhat.com/show_bug.cgi?id=1532060, github.com/cockroachdb/cmux needs to be updated. Automatic glide update (using hack/update-deps.sh, after editing glide.yaml) checks all dependencies, so one gets to see other parts of vendor directory updated too. @deads2k Review please. Thanks.
openshift · Feb 9, 2018 · acfac49 · acfac49
2 parents 65697ed + 8824a74
commit acfac49
Show file tree

Hide file tree

Showing 25 changed files with 544 additions and 260 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -156,6 +156,9 @@ import:
 # master? for bindata
 - package: github.com/jteeuwen/go-bindata
   version: a0ff2567cfb70903282db057e799fd826784d41d
+# router metrics
+- package: github.com/cockroachdb/cmux
+  version: b64f5908f4945f4b11ed4a0a9d3cc1e23350866d
 
 # why do we have this?
 - package: google.golang.org/appengine

diff --git a/vendor/github.com/certifi/gocertifi/certifi.go b/vendor/github.com/certifi/gocertifi/certifi.go
diff --git a/vendor/github.com/cockroachdb/cmux/.travis.yml b/vendor/github.com/cockroachdb/cmux/.travis.yml
diff --git a/vendor/github.com/cockroachdb/cmux/CONTRIBUTORS b/vendor/github.com/cockroachdb/cmux/CONTRIBUTORS
diff --git a/vendor/github.com/cockroachdb/cmux/README.md b/vendor/github.com/cockroachdb/cmux/README.md