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.

Sign up for GitHub

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

Jump to bottom

Fix failed automerge Branch 23.02 merge 22.12 #811

Merged
merged 3 commits into from
Nov 22, 2022
Merged

Fix failed automerge Branch 23.02 merge 22.12 #811

merged 3 commits into from
Nov 22, 2022

Conversation

harrism
Copy link
Member

@harrism harrism commented Nov 22, 2022

Description

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.

isVoid and others added 3 commits November 21, 2022 12:55
@isVoid
Update Dependency List with dependencies.yaml (rapidsai#803)
04593ef 
This PR updates dependency lists with `dependencies.yaml`.

Authors:
   - Michael Wang (https://github.com/isVoid)
   - AJ Schmidt (https://github.com/ajschmidt8)
   - Bradley Dice (https://github.com/bdice)

Approvers:
   - Bradley Dice (https://github.com/bdice)
   - AJ Schmidt (https://github.com/ajschmidt8)
@isVoid
Fix a Bug in Segment Intersection Primitive (rapidsai#808)
1a0885f 
rapidsai#778 introduced segment intersection primitive, but there's a subtle bug in the code. This PR fixes that.

Authors:
  - Michael Wang (https://github.com/isVoid)

Approvers:
  - H. Thomson Comer (https://github.com/thomcom)
  - Mark Harris (https://github.com/harrism)

URL: rapidsai#808
@harrism
Merge branch 'branch-22.12' into branch-23.02-merge-22.12
acf0ea1
@harrism harrism added bug Something isn't working non-breaking Non-breaking change labels Nov 22, 2022
@harrism harrism requested review from a team as code owners November 22, 2022 11:08
@harrism harrism self-assigned this Nov 22, 2022
@github-actions github-actions bot added cmake Related to CMake code or build configuration libcuspatial Relates to the cuSpatial C++ library Python Related to Python code labels Nov 22, 2022
@jjacobelli
Copy link
Contributor

rerun tests

@ajschmidt8 ajschmidt8 changed the base branch from branch-22.12 to branch-23.02 November 22, 2022 14:41
@ajschmidt8 ajschmidt8 requested a review from a team as a code owner November 22, 2022 14:41
@jolorunyomi jolorunyomi merged commit e775585 into rapidsai:branch-23.02 Nov 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@robertmaynard robertmaynard robertmaynard approved these changes

@isVoid isVoid isVoid approved these changes

@jolorunyomi jolorunyomi jolorunyomi approved these changes

@cwharris cwharris Awaiting requested review from cwharris cwharris was automatically assigned from rapidsai/cuspatial-cmake-codeowners

@trxcllnt trxcllnt Awaiting requested review from trxcllnt trxcllnt is a code owner automatically assigned from rapidsai/cuspatial-cpp-codeowners

Assignees

@harrism harrism

Labels
bug Something isn't working cmake Related to CMake code or build configuration libcuspatial Relates to the cuSpatial C++ library non-breaking Non-breaking change Python Related to Python code
Projects
cuSpatial
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@harrism @jjacobelli @robertmaynard @isVoid @jolorunyomi