Skip to content

Commit

Permalink
Merge pull request #10423 from jordanlewis/fix-merge-skew
Browse files Browse the repository at this point in the history
storage: fix merge skew
  • Loading branch information
jordanlewis authored Nov 2, 2016
2 parents bfea8d9 + 156eb39 commit c189c5a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/storage/replica_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6258,7 +6258,7 @@ func TestReplicaTimestampCacheBumpNotLost(t *testing.T) {
ctx := tc.store.AnnotateCtx(context.TODO())
key := keys.LocalMax

txn := newTransaction("test", key, 1, enginepb.SERIALIZABLE, tc.clock)
txn := newTransaction("test", key, 1, enginepb.SERIALIZABLE, tc.Clock())
origTxn := txn.Clone()

minNewTS := func() hlc.Timestamp {
Expand Down

0 comments on commit c189c5a

Please sign in to comment.