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

server: Fix broken code during merge #14101

Merged
merged 1 commit into from
Jun 9, 2022
Merged

server: Fix broken code during merge #14101

merged 1 commit into from
Jun 9, 2022

Conversation

serathius
Copy link
Member

@serathius serathius commented Jun 9, 2022 •
edited
Loading

Looks like a bug created from merging two PRs touching same file.

Run on master https://github.com/etcd-io/etcd/runs/6809173158?check_suite_focus=true

@serathius
Copy link
Member Author

cc @ahrtr @spzala

@serathius serathius mentioned this pull request Jun 9, 2022
Open
@ahrtr ahrtr merged commit 05e4a5a into etcd-io:main Jun 9, 2022
spzala
spzala reviewed Jun 9, 2022
View reviewed changes
Copy link
Member

@spzala spzala left a comment

Choose a reason for hiding this comment

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

lgmt Thanks @serathius

@serathius serathius deleted the fix-merge branch June 15, 2023 20:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spzala spzala spzala left review comments

@ahrtr ahrtr ahrtr approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@serathius @spzala @ahrtr