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

[C++] Merge conflict with AzureFS changes #40562

Closed
bkietz opened this issue Mar 14, 2024 · 1 comment
Closed

[C++] Merge conflict with AzureFS changes #40562

bkietz opened this issue Mar 14, 2024 · 1 comment
Assignees
@bkietz
Labels
Component: C++ Type: bug
Milestone
16.0.0

Comments

@bkietz
Copy link
Member

bkietz commented Mar 14, 2024

Describe the bug, including details regarding any error messages, version, and platform.

#39067 was merged, which conflicted with #40325 producing build failures on main.

https://github.com/apache/arrow/actions/runs/8285793239/job/22674307202?pr=40559#step:6:1750

Component(s)

C++
@bkietz bkietz self-assigned this Mar 14, 2024
bkietz added a commit to bkietz/arrow that referenced this issue Mar 14, 2024
@bkietz
apacheGH-40562: [C++] Repair FileSystem merge error
e6c55fd
@github-actions github-actions bot mentioned this issue Mar 14, 2024
Merged
bkietz added a commit that referenced this issue Mar 14, 2024
@bkietz
GH-40562: [C++] Repair FileSystem merge error (#40564)
eecd779 
### 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

* GitHub Issue: #40562

Authored-by: Benjamin Kietzman <bengilgit@gmail.com>
Signed-off-by: Benjamin Kietzman <bengilgit@gmail.com>
@bkietz bkietz added this to the 16.0.0 milestone Mar 14, 2024
@bkietz
Copy link
Member Author

bkietz commented Mar 14, 2024

Issue resolved by pull request 40564
#40564

@bkietz bkietz closed this as completed Mar 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@bkietz bkietz

Labels
Component: C++ Type: bug
Projects
None yet
Milestone
16.0.0
Development

No branches or pull requests
1 participant
@bkietz