Remove Pull App that didn't seem to work and add a new workflow to pull in upstream changes #1633
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
Realign with upstream miekg/dns
Merge Master from `miekg/dns` into master of `zmap/dns`
Merge upstream miekg/dns from v1.1.45 -> v.1.1.59
Renamed go package as `zdns/dns` instead of `miekg/dns`
Fix module naming issue zdns -> zmap
Re-add the socket re-use + a exchange w/ Context
Sync with upstream v1.1.62
Add workflow to check for new tagged version in miekg/dns and create PR into zmap/dns
update merge method for pull github action
refactor: self require as replace in sub packages
Merge in upstream changes from miekg/dns
|
Closing, messed up the merge process, will reopen on different branch |
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.
Thanks for you pull request, do note the following:
If your PR introduces backward incompatible changes it will very likely not be merged.
We support the last two major Go versions, if your PR uses features from a too new Go version, it
will not be merged.