Merge pull request #10724 from bdarnell/fix-cyan

storage: Renumber proposer-evaluated KV RaftCommand fields
cockroachdb · Nov 16, 2016 · 96a591f · 96a591f
2 parents a3abb50 + 00a2e42
commit 96a591f
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 78 deletions.
diff --git a/pkg/storage/storagebase/proposer_kv.pb.go b/pkg/storage/storagebase/proposer_kv.pb.go
diff --git a/pkg/storage/storagebase/proposer_kv.proto b/pkg/storage/storagebase/proposer_kv.proto
@@ -161,7 +161,7 @@ message RaftCommand {
   // TODO(tschottdorf): using an extra message here (and not just `bytes`) to
   // allow the generated RaftCommand to be compared directly. If
   // this costs an extra large allocation, we need to do something different.
-  optional WriteBatch write_batch = 10011;
+  optional WriteBatch write_batch = 10014;
 
-  reserved 1, 10001 to 10010, 10012;
+  reserved 1, 10001 to 10012;
 }