Skip to content

NEW RECORD TYPE: DHCID#2557

Merged
tlimoncelli merged 8 commits into
masterfrom
tlim_fixdhcp2
Sep 15, 2023
Merged

NEW RECORD TYPE: DHCID#2557
tlimoncelli merged 8 commits into
masterfrom
tlim_fixdhcp2

Conversation

@tlimoncelli
Copy link
Copy Markdown
Contributor

No description provided.

Tom Limoncelli and others added 2 commits September 14, 2023 14:17
@tlimoncelli
Copy link
Copy Markdown
Contributor Author

@fritterhoff Since this was breaking the builds, and since I had a few extra moments, I've fixed the major issue in this PR.

@tlimoncelli
Copy link
Copy Markdown
Contributor Author

Oh geez. The merge is even more messed up than I thought. It un-did #2553 and #2543 too.

Let me see if my git fu can fix all this.

@tlimoncelli
Copy link
Copy Markdown
Contributor Author

@fritterhoff Ah! I think I got it! We'll know for sure when https://github.com/StackExchange/dnscontrol/actions/runs/6190265118/job/16806973100?pr=2557 completes.

@tlimoncelli
Copy link
Copy Markdown
Contributor Author

@fritterhoff I think I fixed it all. Can you take a look? (Perhaps test it with axfrddns to be sure. I don't have have an automated test for that provider)

@fritterhoff
Copy link
Copy Markdown
Contributor

LGTM! Sorry for the extra work...

@tlimoncelli
Copy link
Copy Markdown
Contributor Author

No worries. I blame git :)

@tlimoncelli tlimoncelli merged commit 6ad7f34 into master Sep 15, 2023
@tlimoncelli tlimoncelli deleted the tlim_fixdhcp2 branch September 15, 2023 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants