Skip to content
This repository has been archived by the owner on Mar 28, 2020. It is now read-only.

pkg/*: Use endpoint status for probes #2029

Merged
merged 2 commits into from
Dec 21, 2018
Merged

Conversation

avorima
Copy link
Contributor

@avorima avorima commented Dec 18, 2018

endpoint status doesn't require a username when authentication is enabled.

Fixes #1957

@etcd-bot
Copy link
Collaborator

Can one of the admins verify this patch?

2 similar comments
@etcd-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@etcd-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@hexfusion
Copy link
Member

@etcd-bot ok to test

@hexfusion
Copy link
Member

@avorima I appreciate the PR this seems fine the result is the same and as you noted it allows auth. Can you please update the commit message to read pkg/*: Use endpoint status for probes also update CHANGELOG in a separate commit. Thanks!

@avorima avorima changed the title Use endpoint status for probe checks pkg/*: Use endpoint status for probes Dec 19, 2018
@avorima
Copy link
Contributor Author

avorima commented Dec 19, 2018

@hexfusion Thanks for the quick response. Hope this is ok.

@hexfusion
Copy link
Member

hexfusion commented Dec 19, 2018

@avorima OK we are really close, but we need to get rid of the merge commit. And we would like all commit messages to be $package: $message

try

# remove merge commit
git reset --hard HEAD~1

# rename CHANGELOG commit
git commit --amend -m'CHANGELOG: updated to reflect probe fix'

# sanity check
git log

git push -f

Thanks!

@avorima
Copy link
Contributor Author

avorima commented Dec 19, 2018

@hexfusion What about the merge conflict?

@hexfusion
Copy link
Member

@avorima I see you need to rebase against master.

@hexfusion
Copy link
Member

lgtm, thanks @avorima!

@hexfusion
Copy link
Member

hexfusion commented Dec 20, 2018

@avorima I have run into an issue merging your commit because it has no email address.

please update with interactive rebase.

git rebase -i HEAD~2

you will see something like

pick 7c7141550 pkg/*: Use endpoint status for probes
pick a580ec454 CHANGELOG: updated to reflect probe fix

change pick to edit for both and save this will start the rebase.
for each

git commit --amend --author="Mario Valderrama <[email protected]>"
git rebase --continue

when done git push -f

Then please make sure to update your email address for future commits.
https://help.github.com/articles/setting-your-commit-email-address-in-git

Once this is done I can merge, thanks!

@avorima
Copy link
Contributor Author

avorima commented Dec 21, 2018

My bad, here you go.

@hexfusion hexfusion merged commit 2cd243b into coreos:master Dec 21, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants