Merge cockroachdb#55843 cockroachdb#55844

55843: roachpb: track a few auto-generated files as binary files r=irfansharif a=irfansharif Makes the `git` invocations a bit more useful. Release note: None 55844: keys: update doc.go to include node tombstone key r=irfansharif a=irfansharif Release note: None Co-authored-by: irfan sharif <[email protected]>
knz · Oct 22, 2020 · 4019977 · 4019977
3 parents 40b7942 + bc95b48 + 0c740e3
commit 4019977
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/pkg/keys/doc.go b/pkg/keys/doc.go
@@ -214,6 +214,7 @@ var _ = [...]interface{}{
 	StoreGossipKey,              // "goss"
 	StoreHLCUpperBoundKey,       // "hlcu"
 	StoreIdentKey,               // "iden"
+	StoreNodeTombstoneKey,       // "ntmb"
 	StoreLastUpKey,              // "uptm"
 
 	// The global keyspace includes the meta{1,2}, system, system tenant SQL

diff --git a/pkg/roachpb/.gitattributes b/pkg/roachpb/.gitattributes
@@ -0,0 +1,2 @@
+batch_generated.go -diff
+*_string.go -diff