Code

Fix merge conflict with new tests#13869

Code

Merged

dbussink merged 3 commits intovitessio:mainvitessio/vitess:mainfrom planetscale:dbussink/fix-merge-conflictplanetscale/vitess:dbussink/fix-merge-conflictCopy head branch name to clipboardAug 28, 2023

+7-9

Commits

Commits on Aug 28, 2023

• Fix merge conflict with new tests

  Show description for 8d99b13
  dbussink

  committed
  8d99b13

• Also shut down goroutine on context expiry

  Show description for aa9f7d3
  dbussink

  committed
  aa9f7d3

• Avoid race condition for shutdown

  Show description for 9963cef
  dbussink

  committed
  9963cef