net-next merge to master #8174
Closed
net-next merge to master #8174
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-Authored-By: Tim Gross <[email protected]> Co-Authored-By: Seth Hoenig <[email protected]>
Adding missing vendor files as well.
schmichael
approved these changes
Jun 16, 2020
| @@ -1018,6 +1018,10 @@ func TestParse(t *testing.T) { | |||
| To: 8080, | |||
| }, | |||
| }, | |||
| DNS: &api.DNSConfig{ | |||
| Servers: []string{"8.8.8.8"}, | |||
| Options: []string{"ndots:2", "edns0"}, | |||
|
Replaced by a rebased version in #8203 |
|
I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These changes were reviewed in #7661 and #7518, however a quick check would be appreciated to make sure conflicts with master were resolved correctly.