Merge pull request #58720 from bdarnell/skippy-20.2

cockroachdb · Jan 12, 2021 · eda2309 · eda2309
2 parents 6528ec9 + 7fba66e
commit eda2309
Show file tree

Hide file tree

Showing 80 changed files with 803 additions and 803 deletions.
diff --git a/go.mod b/go.mod
@@ -170,7 +170,7 @@ require (
 	vitess.io/vitess v0.0.0-00010101000000-000000000000
 )
 
-replace github.com/gogo/protobuf => github.com/cockroachdb/gogoproto v1.2.1-0.20190102194534-ca10b809dba0
+replace github.com/gogo/protobuf => github.com/cockroachdb/gogoproto v1.2.1-0.20210111172841-8b6737fea948
 
 replace github.com/grpc-ecosystem/grpc-gateway => github.com/cockroachdb/grpc-gateway v1.14.6-0.20200519165156-52697fc4a249
 

diff --git a/go.sum b/go.sum
@@ -154,8 +154,8 @@ github.com/cockroachdb/etcd v0.4.7-0.20200615211340-a17df30d5955 h1:1ELogBFqZl2C
 github.com/cockroachdb/etcd v0.4.7-0.20200615211340-a17df30d5955/go.mod h1:Vshs83p1UXI6fjU8eWVgqXeewFxRDP1fNVF5PHiSBm0=
 github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55 h1:YqzBA7tf8Gv8Oz0BbBsPenqkyjiohS7EUIwi7p1QJCU=
 github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55/go.mod h1:QqVqNIiRhLqJXif5C9wbM4JydBhrAF2WDMxkv5xkyxQ=
-github.com/cockroachdb/gogoproto v1.2.1-0.20190102194534-ca10b809dba0 h1:UoEUWRRZjeOfGenewnmzRCA0kWWRtZogNdidaXjZ/+c=
-github.com/cockroachdb/gogoproto v1.2.1-0.20190102194534-ca10b809dba0/go.mod h1:iEEnNJHQ499vc8YlB9zMzx81dfYQXSTukEEGG2EnUHE=
+github.com/cockroachdb/gogoproto v1.2.1-0.20210111172841-8b6737fea948 h1:yrdrJWJpn0+1BmXaRzurDIZz3uHmSs/wnwWbC4arWlQ=
+github.com/cockroachdb/gogoproto v1.2.1-0.20210111172841-8b6737fea948/go.mod h1:iEEnNJHQ499vc8YlB9zMzx81dfYQXSTukEEGG2EnUHE=
 github.com/cockroachdb/gostdlib v1.13.0 h1:TzSEPYgkKDNei3gbLc0rrHu4iHyBp7/+NxPOFmcXGaw=
 github.com/cockroachdb/gostdlib v1.13.0/go.mod h1:eXX95p9QDrYwJfJ6AgeN9QnRa/lqqid9LAzWz/l5OgA=
 github.com/cockroachdb/grpc-gateway v1.14.6-0.20200519165156-52697fc4a249 h1:pZuUpNtmLArGU2vCW+mNetvruw6jRcxDxwOnMT+XLWI=

diff --git a/pkg/acceptance/cluster/testconfig.pb.go b/pkg/acceptance/cluster/testconfig.pb.go
diff --git a/pkg/blobs/blobspb/blobs.pb.go b/pkg/blobs/blobspb/blobs.pb.go
diff --git a/pkg/build/info.pb.go b/pkg/build/info.pb.go
diff --git a/pkg/ccl/backupccl/backup.pb.go b/pkg/ccl/backupccl/backup.pb.go
diff --git a/pkg/ccl/baseccl/encryption_options.pb.go b/pkg/ccl/baseccl/encryption_options.pb.go
diff --git a/pkg/ccl/storageccl/engineccl/enginepbccl/key_registry.pb.go b/pkg/ccl/storageccl/engineccl/enginepbccl/key_registry.pb.go
diff --git a/pkg/ccl/storageccl/engineccl/enginepbccl/stats.pb.go b/pkg/ccl/storageccl/engineccl/enginepbccl/stats.pb.go
diff --git a/pkg/ccl/utilccl/licenseccl/license.pb.go b/pkg/ccl/utilccl/licenseccl/license.pb.go
diff --git a/pkg/cli/systembench/systembenchpb/ping.pb.go b/pkg/cli/systembench/systembenchpb/ping.pb.go
diff --git a/pkg/clusterversion/cluster_version.pb.go b/pkg/clusterversion/cluster_version.pb.go
diff --git a/pkg/config/system.pb.go b/pkg/config/system.pb.go