[FAB-12506] pick up data race fix in go-metrics

Change-Id: I07dc118a2538fec1e6fb9068fc264c48d9bfc73b Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
hyperledger · Oct 17, 2018 · 89132ff · 89132ff
1 parent 916a59b
commit 89132ff
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 83 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -21,12 +21,6 @@ noverify = [
   name = "github.com/Shopify/sarama"
   version = "1.19.0"
 
-# Pinned in support of sarama as newer commits have data races
-# https://github.com/rcrowley/go-metrics/issues/245
-[[override]]
-  name = "github.com/rcrowley/go-metrics"
-  revision = "8732c616f52954686704c8645fe1a9d59e9df7c1"
-
 [[constraint]]
   name = "github.com/davecgh/go-spew"
   version = "1.1.0"

diff --git a/vendor/github.com/rcrowley/go-metrics/ewma.go b/vendor/github.com/rcrowley/go-metrics/ewma.go
diff --git a/vendor/github.com/rcrowley/go-metrics/gauge_float64.go b/vendor/github.com/rcrowley/go-metrics/gauge_float64.go
diff --git a/vendor/github.com/rcrowley/go-metrics/meter.go b/vendor/github.com/rcrowley/go-metrics/meter.go
diff --git a/vendor/github.com/rcrowley/go-metrics/registry.go b/vendor/github.com/rcrowley/go-metrics/registry.go