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 build after the constraints code landed #100

Merged
merged 2 commits into from
Oct 16, 2023

Conversation

botovq
Copy link
Member

@botovq botovq commented Oct 14, 2023

No description provided.

@cjeker
Copy link
Member

cjeker commented Oct 16, 2023

I merged this in, had to split the commits because the patches directory is annoying :)
Merged with commit aa554ab

@cjeker cjeker merged commit aa554ab into rpki-client:master Oct 16, 2023
@botovq
Copy link
Member Author

botovq commented Oct 16, 2023 via email

@cjeker
Copy link
Member

cjeker commented Oct 16, 2023

Having the two commit split was a big help. I just need to push the changes into my patches branch of rpki-client-openbsd and then format-patch again. So when rebasing the branch I get the same conflict you fixed.
The files in patches are just a bit annoying to work with since we want to keep them up to date.
I'm not sure if I can add the patches branch to rpki-client-openbsd or if the import script will clobber the branch.

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