Code

Fix forward-merge conflicts#4857

Code

Merged

ajschmidt8 merged 7 commits intorapidsai:branch-22.10rapidsai/cuml:branch-22.10from ajschmidt8:fix-merge-conflictsCopy head branch name to clipboardAug 5, 2022

+1,359-788

Commits

Commits on Aug 2, 2022

• Update Python build to scikit-build (#4818)

  Show description for 33c0170
  dantegd

  authored
  33c0170

• Pin dask & distributed for release (#4850)

  Show description for 350d709
  galipremsagar

  authored
  350d709

Commits on Aug 3, 2022

• Improvements in feature sampling (#4278)

  Show description for 3b3b891
  vinaydes

  authored
  3b3b891

Commits on Aug 4, 2022

• Centralize common css & js code in docs (#4844)

  Show description for 55d3ef4
  galipremsagar

  authored
  55d3ef4

• Use common code in python docs and defer js loading (#4852)

  Show description for 63e8807
  galipremsagar

  authored
  63e8807

Commits on Aug 5, 2022

• Merge branch-22.08 into fix-merge-conflicts

  ajschmidt8

  committed
  9a80b97

• fix remaining versions

  ajschmidt8

  committed
  7a0ab85