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

Fix Forward-Merge Conflicts [skip ci] #445

Merged
merged 3 commits into from
Aug 23, 2021

Conversation

ajschmidt8
Copy link
Member

This PR fixes the merge conflicts in CHANGELOG.md for the latest forward-merger PR.

raydouglass and others added 3 commits August 4, 2021 10:11
…ial (rapidsai#441)

Previously on CentOS machines the CMake files would be placed into `lib64`,
and `libcuspatial` would be in `lib` breaking everything. Since Conda only
supports packages in `lib` ensure everything is placed there no matter
the distro.
@ajschmidt8 ajschmidt8 requested a review from a team as a code owner August 23, 2021 13:56
@ajschmidt8 ajschmidt8 added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Aug 23, 2021
@github-actions github-actions bot added cmake Related to CMake code or build configuration libcuspatial Relates to the cuSpatial C++ library labels Aug 23, 2021
@ajschmidt8 ajschmidt8 merged commit f11540e into rapidsai:branch-21.10 Aug 23, 2021
@ajschmidt8 ajschmidt8 deleted the fix-changelogs branch August 23, 2021 13:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cmake Related to CMake code or build configuration improvement Improvement / enhancement to an existing function libcuspatial Relates to the cuSpatial C++ library non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants