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

Minor cleanup for queryable function support #20139

Merged
merged 1 commit into from
Mar 6, 2020
Merged

Conversation

roji
Copy link
Member

@roji roji commented Mar 3, 2020

@roji roji requested a review from smitpatel March 3, 2020 16:24
@smitpatel
Copy link
Member

Please don't! I am already working in this area and this will just cause merge conflicts!

@roji
Copy link
Member Author

roji commented Mar 3, 2020

No worries, I can rebase this (if necessary!) after you finish your work. Feel free to close this, or just ping me here when you're done for me to rebase.

@pmiddleton
Copy link
Contributor

merge-conflicts-merge

@smitpatel
Copy link
Member

Can you resolve existing conflicts? #20178 can cause some conflicts but nothing major. Either PR going first is fine.

@roji
Copy link
Member Author

roji commented Mar 5, 2020

@smitpatel working on merge conflicts isn't my preferred pre-bedtime activity...! Go ahead and merge yours, I'll take care of resolving conflicts tomorrow.

@pmiddleton
Copy link
Contributor

@roji

You might want to checkout #20178 before you say that:)

@roji
Copy link
Member Author

roji commented Mar 5, 2020

@smitpatel already did thumbs-up so I've lost my chance...

@roji roji force-pushed the QueryableFunctionCleanup branch from bf4ee6f to 9e72ab7 Compare March 5, 2020 09:17
@roji
Copy link
Member Author

roji commented Mar 5, 2020

Rebased, not too much left!

@roji roji merged commit ec65dec into master Mar 6, 2020
@roji roji deleted the QueryableFunctionCleanup branch March 6, 2020 16:24
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.

4 participants