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-25.02 into branch-25.04 #1430

Merged
merged 1 commit into from
Jan 27, 2025
Merged

Conversation

rapids-bot[bot]
Copy link

@rapids-bot rapids-bot bot commented Jan 27, 2025

Forward-merge triggered by push to branch-25.02 that creates a PR to keep branch-25.04 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. See forward-merger docs for more info.

Contributes to rapidsai/build-planning#142

`ucx-proc` is no longer necessary, for the reasons described in that issue. This proposes dropping the dependency on it here.

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)

URL: #1429
@rapids-bot rapids-bot bot requested a review from a team as a code owner January 27, 2025 16:05
@rapids-bot rapids-bot bot requested a review from gforsyth January 27, 2025 16:05
Copy link
Author

rapids-bot bot commented Jan 27, 2025

FAILURE - Unable to forward-merge due to an error, 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 the conda conda issue label Jan 27, 2025
@AyodeAwe AyodeAwe merged commit 9224fa3 into branch-25.04 Jan 27, 2025
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conda conda issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants