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

fix: revert golang.org/x/sys bump to avoid FreeBSD regression #7780

Merged
merged 3 commits into from
May 5, 2020

Conversation

mikemorris
Copy link
Contributor

@mikemorris mikemorris commented May 4, 2020

Refs hashicorp/serf#602, which should be merged and released, then the Serf dep updated in go.mod to a released version, before merging this.

Temporarily pin to unreleased Serf version which removes unnecessary
transitive dependency on newer version of golang.org/x/sys and resolves to a version prior to the introduction of the regression on FreeBSD platforms.

The Serf bump in #7747 updated golang.org/x/sys to a more recent version than necessary due to an explicit indirect dependency.

Temporarily pin to unreleased Serf version which removes unnecessary
transitive dependency on newer version of golang.org/x/sys
@mikemorris mikemorris added the pr/do-not-merge PR cannot be merged in its current form. label May 4, 2020
@mikemorris mikemorris requested a review from hanshasselberg May 4, 2020 22:00
Copy link
Member

@hanshasselberg hanshasselberg left a comment

Choose a reason for hiding this comment

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

LGTM

@hanshasselberg hanshasselberg added backport/1.7 and removed pr/do-not-merge PR cannot be merged in its current form. backport/1.7 labels May 5, 2020
@hanshasselberg hanshasselberg merged commit 291e6af into master May 5, 2020
@hanshasselberg hanshasselberg deleted the fix/sys-freebsd-regression branch May 5, 2020 07:26
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.

2 participants