Code

Fix Merge Conflicts [skip ci]#786

Code

Merged

kkraus14 merged 8 commits intorapidsai:branch-21.08rapidsai/rmm:branch-21.08from ajschmidt8:branch-21.08-merge-21.06Copy head branch name to clipboardMay 24, 2021

+70-19

Commits

Commits on May 20, 2021

• update changelog (#777)

  ajschmidt8

  authored
  6e8b978

  Copy full SHA for 6e8b978

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

  ajschmidt8

  committed
  753a9b3

  Copy full SHA for 753a9b3

• Merge pull request #779 from ajschmidt8/branch-21.06-merge-0.19

  Show description for 1a9d454
  ajschmidt8

  authored
  1a9d454

  Copy full SHA for 1a9d454

• Update CHANGELOG.md links for calver (#781)

  Show description for d8d1330
  ajschmidt8

  authored
  d8d1330

  Copy full SHA for d8d1330

Commits on May 24, 2021

• FindThrust now guards against multiple inclusion by different consumers (#784)

  Show description for 8a6baa0
  robertmaynard

  authored
  8a6baa0

  Copy full SHA for 8a6baa0

• upgrade spdlog to 1.8.5 (#658)

  Show description for a4c21d7
  rongou

  authored
  a4c21d7

  Copy full SHA for a4c21d7

• Update environment variable used to determine cuda_version (#785)

  Show description for 0cc1380
  ajschmidt8

  authored
  0cc1380

  Copy full SHA for 0cc1380

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

  ajschmidt8

  committed
  f1da9be

  Copy full SHA for f1da9be