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 logical conflict #1801

Merged
merged 1 commit into from
Feb 9, 2022
Merged

Conversation

alamb
Copy link
Contributor

@alamb alamb commented Feb 9, 2022

Fix logical conflict between 1bedaf3 (1bedaf3) which added a new example ExecutionPlan and 071f14a (#1776) that added a new required trait method for ExecutionPlan

@alamb
Copy link
Contributor Author

alamb commented Feb 9, 2022

cc @thinkharderdev @matthewmturner

@matthewmturner
Copy link
Contributor

thx @alamb. I was getting very confused lol

@realno
Copy link
Contributor

realno commented Feb 9, 2022

This actually breaks the build (at least on m1 mac), not sure how it wasn't captured by the pipeline 🤔

@alamb
Copy link
Contributor Author

alamb commented Feb 9, 2022

@realno I think it is because two different PRs passed the CI checks individually but together they broke things

@alamb alamb merged commit 6c80725 into apache:master Feb 9, 2022
@alamb alamb deleted the alamb/fix_logical_conflict branch February 9, 2022 20:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants