Code

Fix 21.08 forward-merge conflicts#274

Code

Merged

ajschmidt8 merged 3 commits intorapidsai:branch-21.08rapidsai/raft:branch-21.08from ajschmidt8:branch-21.08-merge-21.06Copy head branch name to clipboardJun 11, 2021

+17-2

Commits

Commits on Jun 9, 2021

• update changelog

  raydouglass

  committed
  d70e677

Commits on Jun 10, 2021

• fix changelog (#271)

  ajschmidt8

  authored
  d175cfd

Commits on Jun 11, 2021

• Merge remote-tracking branch 'upstream/branch-21.06' into branch-21.08-merge-21.06

  ajschmidt8

  committed
  c5a87f5