Merge pull request #47611 from petermattis/pmattis/backport-pebble

release-20.1: vendor: bump pebble to b46a83e31ff105cf3ffa3dcc67c4e9223b6b2f0a
cockroachdb · Apr 17, 2020 · c0f00d2 · c0f00d2
2 parents acb35ed + 9357e90
commit c0f00d2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -127,7 +127,7 @@ ignored = [
 
 [[constraint]]
   name = "github.com/cockroachdb/pebble"
-  branch = "master"
+  branch = "crl-release-20.1"
 
 # github.com/lib/pq has a newer revision that has notices, which we want
 [[override]]

diff --git a/vendor b/vendor
+16 −3		github.com/cockroachdb/pebble/bloom/bloom.go
+6 −2		github.com/cockroachdb/pebble/options.go