Merge #26868

26868: roachpb: Fix a comment on orig_timestamp. r=andreimatei a=andreimatei Release note: None Co-authored-by: Andrei Matei <[email protected]>
cockroachdb · Jun 25, 2018 · ac55e58 · ac55e58
2 parents e0164df + 7224179
commit ac55e58
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/roachpb/data.pb.go b/pkg/roachpb/data.pb.go
diff --git a/pkg/roachpb/data.proto b/pkg/roachpb/data.proto
@@ -267,7 +267,7 @@ message Transaction {
   // future of 5), and restarts.
   // Using instead its candidate commit timestamp, it wouldn't see a conflict
   // and commit, but this is not the expected outcome (the expected outcome is
-  // {key1: 6} (since txn2 is not expected to commit)) and we would be
+  // {key1: 6} (since txn1 is not expected to commit)) and we would be
   // experiencing the Lost Update Anomaly.
   //
   // Note that in practice, before restarting, txn1 would still lay down an