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

CASSGO-35 standardize spelling of datacenter #1843

Merged
merged 1 commit into from
Feb 3, 2025

Conversation

bgerrity
Copy link
Contributor

Keeps the repo internally consistent. The public interface is kept to prevent breakage.

@bgerrity bgerrity changed the title standardize spelling of datacenter CASSGO-35 standardize spelling of datacenter Nov 20, 2024
@bgerrity
Copy link
Contributor Author

@martin-sucha Would yo be able to kick the CI here?

@joao-r-reis
Copy link
Contributor

I'm not seeing an option to trigger the workflow, can you push another commit or rebase?

@bgerrity bgerrity force-pushed the strike-datacentre-spelling branch from e570216 to cbfcd16 Compare January 9, 2025 16:14
@bgerrity
Copy link
Contributor Author

@joao-r-reis Think someone else needs to merge it.

@joao-r-reis
Copy link
Contributor

@joao-r-reis Think someone else needs to merge it.

Yes, I'm waiting for a second +1

@jameshartig
Copy link
Contributor

I'm good with these changes

@joao-r-reis
Copy link
Contributor

@bgerrity can you update your commit message according to our guidelines? Then I'll merge this.

@bgerrity bgerrity force-pushed the strike-datacentre-spelling branch from cbfcd16 to 9c62009 Compare January 29, 2025 15:48
@bgerrity
Copy link
Contributor Author

Fixed the commit message

@joao-r-reis
Copy link
Contributor

Oh the CHANGELOG.md entry is also missing, sorry didn't check it before

@bgerrity
Copy link
Contributor Author

Ok pushed that.

@joao-r-reis
Copy link
Contributor

We typically ask for commits to be squashed into a single commit unless there's a good reason to have multiple commits, also there's a git conflict (I just merged another PR sorry about that).

I can resolve the conflict and do the squashing myself if you don't mind this PR not being considered "merged" by Github (I will still keep you as author of the commit)

@bgerrity bgerrity force-pushed the strike-datacentre-spelling branch from db61a9b to f955b6c Compare January 29, 2025 23:20
@bgerrity
Copy link
Contributor Author

Rebased and squashed.

@bgerrity bgerrity force-pushed the strike-datacentre-spelling branch from f955b6c to 0d1da20 Compare January 29, 2025 23:21
@jameshartig
Copy link
Contributor

@bgerrity sorry there's a conflict with the CHANGELOG.md file. Can you rebase and we can commit?

@joao-r-reis
Copy link
Contributor

I'm going to merge #1823 in a second and then I'll hold off on merging PRs until we can get this in otherwise changelog conflicts will keep preventing us from merging this one

@bgerrity bgerrity force-pushed the strike-datacentre-spelling branch from 0d1da20 to 623c219 Compare January 31, 2025 18:51
@bgerrity
Copy link
Contributor Author

Pushed it past the conflicts again.

@joao-r-reis
Copy link
Contributor

@jameshartig just merged something before I got to this 😢 we really need to change how we update the changelog

@jameshartig let's hold off on merging stuff until we get this one in. @bgerrity sorry to ask you again, one last time I promise. Also can you take the chance and rewrite the commit message title ? "strike datacentre spelling" to "standardize datacenter spelling" maybe?

@bgerrity bgerrity force-pushed the strike-datacentre-spelling branch from 623c219 to 80ac8ce Compare February 3, 2025 17:19
This change keeps the repo internally consistent in the spelling of "datacenter". The public interface is kept to prevent breakage.

Patch by Brendan Gerrity; reviewed by João Reis, James Hartig for CASSGO-35
@bgerrity bgerrity force-pushed the strike-datacentre-spelling branch from 80ac8ce to a45aeea Compare February 3, 2025 17:20
@bgerrity
Copy link
Contributor Author

bgerrity commented Feb 3, 2025

Pushed again with the rebase and the new commit message

@joao-r-reis joao-r-reis merged commit cb139a3 into apache:trunk Feb 3, 2025
16 checks passed
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