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 #2565

Merged
merged 1 commit into from
Jan 31, 2025
Merged

Conversation

rapids-bot[bot]
Copy link

@rapids-bot rapids-bot bot commented Jan 31, 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.

This PR fixes two errors in docs builds:
1. a function with `void` return type had a `@return` parameter, which
causes an error. The error was `error: found documented return type for
raft::random::device::warp_random_sample that does not return anything`
2. a function with return type `std::vector<S>` was being misinterpreted
as the beginning of an HTML tag `<S>`. This resulted in `error: end of
comment block while expecting command </s>`.
@rapids-bot rapids-bot bot requested a review from a team as a code owner January 31, 2025 23:40
@GPUtester GPUtester merged commit 9927bdd into branch-25.04 Jan 31, 2025
11 of 14 checks passed
@github-actions github-actions bot added the cpp label Jan 31, 2025
Copy link
Author

rapids-bot bot commented Jan 31, 2025

SUCCESS - forward-merge complete.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants