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 merge conflicts [skip gpuci] #2155

Merged
merged 3 commits into from Mar 23, 2022

Conversation

ajschmidt8
Copy link
Member

This PR fixes the merge conflicts in #2149.

galipremsagar and others added 3 commits March 23, 2022 14:02
Pin changes to be in-line with: rapidsai/cudf#10481

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

Approvers:
  - AJ Schmidt (https://github.com/ajschmidt8)

URL: rapidsai#2147
I recently committed a config file to be used by the [rapidsai/ops-bot](https://github.com/rapidsai/ops-bot/) and in hindsight, I should've had the new `external_contributors` functionality set to `false` until we're ready to roll it out everywhere. This PR fixes that.

Authors:
   - AJ Schmidt (https://github.com/ajschmidt8)

Approvers:
@ajschmidt8 ajschmidt8 added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Mar 23, 2022
@ajschmidt8 ajschmidt8 requested a review from a team as a code owner March 23, 2022 19:39
@ajschmidt8 ajschmidt8 merged commit ed56b0d into rapidsai:branch-22.06 Mar 23, 2022
@ajschmidt8 ajschmidt8 deleted the fix-merge-conflicts branch March 23, 2022 19:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants