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

GH-40562: [C++] Repair FileSystem merge error #40564

Merged
merged 2 commits into from
Mar 14, 2024

Conversation

bkietz
Copy link
Member

@bkietz bkietz commented Mar 14, 2024

Rationale for this change

Failure to rebase and build when merging #39067 (which renamed internal::Uri -> util::Uri) led to a merge conflict since #40325 added more usages of internal::Uri

What changes are included in this PR?

Rename internal::Uri -> util::Uri

Are these changes tested?

Yes

Are there any user-facing changes?

No

@bkietz bkietz requested a review from felipecrv March 14, 2024 20:21
@github-actions github-actions bot added awaiting merge Awaiting merge and removed awaiting committer review Awaiting committer review labels Mar 14, 2024
Copy link
Member

@kou kou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@bkietz bkietz merged commit eecd779 into apache:main Mar 14, 2024
35 of 36 checks passed
@bkietz bkietz removed the awaiting merge Awaiting merge label Mar 14, 2024
Copy link

After merging your PR, Conbench analyzed the 7 benchmarking runs that have been run so far on merge-commit eecd779.

There were 2 benchmark results indicating a performance regression:

The full Conbench report has more details. It also includes information about 2 possible false positives for unstable benchmarks that are known to sometimes produce them.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants