Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forward-merge branch-23.10 to branch-23.12 #5594

Merged
merged 2 commits into from
Oct 2, 2023
Merged

Conversation

GPUtester
Copy link
Contributor

Forward-merge triggered by push to branch-23.10 that creates a PR to keep branch-23.12 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge.

This PR pins `dask` and `distributed` to `2023.9.2` for `23.10` release.


xref: rapidsai/cudf#14225

Authors:
  - GALI PREM SAGAR (https://github.com/galipremsagar)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)
  - Dante Gama Dessavre (https://github.com/dantegd)
  - Peter Andreas Entschev (https://github.com/pentschev)

URL: #5592
@GPUtester GPUtester requested review from a team as code owners September 28, 2023 23:01
@GPUtester
Copy link
Contributor Author

FAILURE - Unable to forward-merge due to conflicts, manual merge is necessary. Do not use the Resolve conflicts option in this PR, follow these instructions https://docs.rapids.ai/maintainers/forward-merger/
IMPORTANT: When merging this PR, do not use the auto-merger (i.e. the /merge comment). Instead, an admin must manually merge by changing the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

@github-actions github-actions bot added conda conda issue Cython / Python Cython or Python issue ci labels Sep 28, 2023
…ssion, from C++, Cython, to Dask Python class (#5565)

Github issue: #5501

This PR depends on and has included [PR 5558](#5558).

Authors:
  - Jinfeng Li (https://github.com/lijinf2)

Approvers:
  - Simon Adorf (https://github.com/csadorf)
  - Dante Gama Dessavre (https://github.com/dantegd)

URL: #5565
@rapids-bot rapids-bot bot requested a review from a team as a code owner September 29, 2023 16:29
@bdice
Copy link
Contributor

bdice commented Oct 2, 2023

Replaced by #5596.

@raydouglass raydouglass merged commit 99e0c36 into branch-23.12 Oct 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci conda conda issue CUDA/C++ Cython / Python Cython or Python issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants