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

Update from latest upstream master #2

Merged
merged 15 commits into from
Apr 26, 2022
Merged

Update from latest upstream master #2

merged 15 commits into from
Apr 26, 2022

Conversation

56quarters
Copy link

See grafana/mimir#1743

Signed-off-by: Nick Pillitteri nick.pillitteri@grafana.com

stevesg and others added 15 commits July 8, 2021 15:51
@stevesg
Fix for compound messages containing >255 messages.
8d2a27a
@Austinpayne
Fix udp writes not causing nodes to become suspect (hashicorp#242)
7e2219b 
Handle the udp write error case in failedRemote
@rboyer
pass go vet (hashicorp#244)
123f3fb
@rboyer
add an optional wrapper labels to packets and streams (hashicorp#246)
923f1b2
@bwaters
Add warning message for remote node state limit
c25dd11
@bwaters
Tweak format
2d2beb5
@bwaters
run go fmt
17f2681
@bwaters
Need type conversion
678bbf4
@bwaters
Send out warning before crossing limit
c0dd9bd
@kisunji
Merge pull request hashicorp#252 from bwaters/remote_state_warn
5f7e384 
Add warning message for remote node state limit
@bwaters
Purge left nodes along with dead ones (hashicorp#254)
0bff309 
Keep the state from infinitely expanding
@nodakai
state.go: log the timeout value on a ping timeout (hashicorp#153)
3c0cdff 
This will help users' troubleshooting

Signed-off-by: NODA, Kai <nodakai@gmail.com>
@markan
Merge pull request hashicorp#239 from stevesg/compound-fix
3902b1c 
Fix for compound messages containing >255 messages.
@krastin
be explicit about protocol in state errors: TCP or UDP (hashicorp#258)
696ff46
@56quarters
Merge branch 'master' into gem-version-update
6b97a09
@56quarters
Copy link
Author

Commands run to generate this PR:

git clone git@github.com:grafana/memberlist.git && cd memberlist
git remote add upstream git@github.com:hashicorp/memberlist.git
git checkout gem-version
git checkout -b gem-version-update
git merge upstream/master
# fix conflict in util.go
git push origin gem-version-update

@56quarters 56quarters marked this pull request as ready for review April 25, 2022 18:48
@pracucci pracucci self-requested a review April 26, 2022 06:43
pracucci
pracucci approved these changes Apr 26, 2022
View reviewed changes
Copy link

@pracucci pracucci left a comment

Choose a reason for hiding this comment

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

Most changes are related to the new per-packet label, that we're not going to enable. LGTM

@pracucci pracucci merged commit 11ca4b3 into gem-version Apr 26, 2022
@pstibrany pstibrany deleted the gem-version-update branch July 14, 2022 13:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pracucci pracucci pracucci approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
10 participants
@56quarters @pracucci @stevesg @Austinpayne @rboyer @bwaters @kisunji @nodakai @markan @krastin