Sync 6.0/stage with master #13
Merged
Conversation
This file contains hidden or 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
Print IPv4 address correctly on little-endian systems
Fix handling of netlink sockets
Handle errors in print_files that can cause pfiles to panic if a file descriptor is closed while it is iterating over /proc/[pid]/fd/.
pzakha
approved these changes
Jun 19, 2020
sebroy
approved these changes
Jun 19, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Backport changes in master to 6.0. I plan to enable the
sync-with-masteraction so that these PRs will be created automatically in the future, but this particular backport had some conflicts that needed resolving, and it was cleaner to do this one manually. The conflicts were because some previous backports were done via cherry-picks instead of merges.The result of this change will be that the contents of 6.0/stage will be identical to master.
ab-pre-push: http://selfservice.jenkins.delphix.com/job/devops-gate/job/master/job/appliance-build-orchestrator-pre-push/3695/