6
85
Fork
You've already forked dns
39

GOTMPL rr #322

Open
miekg wants to merge 14 commits from miek/2025-10-18@2017 into main
pull from: miek/2025-10-18@2017
merge into: miekg:main
miekg:main
miekg:miek/26/jun24wo/14
miekg:miek/26/mrt24di/tls
miekg:miek/26/mrt09ma/17
miekg:miek/26/feb15zo/13
miekg:miek/zo-07-dec-25/gslb1
miekg:miek/2025-10-26@1431
Owner
Copy link
No description provided. 
Signed-off-by: Miek Gieben <miek@miek.nl>
@cl : Add GOTMPL RR
All checks were successful
ci/woodpecker/push/build Pipeline was successful
ci/woodpecker/pr/build Pipeline was successful
21ab1e4e50 
Signed-off-by: Miek Gieben <miek@miek.nl>
Show startup hook for rrs
Some checks failed
ci/woodpecker/pr/build Pipeline failed
ci/woodpecker/push/build Pipeline failed
420234f32d 
Signed-off-by: Miek Gieben <miek@miek.nl>
more
Some checks failed
ci/woodpecker/pr/build Pipeline failed
ci/woodpecker/push/build Pipeline failed
29bc506d12 
Signed-off-by: Miek Gieben <miek@miek.nl>
examples
All checks were successful
ci/woodpecker/pr/build Pipeline was successful
ci/woodpecker/push/build Pipeline was successful
ede937243c 
Signed-off-by: Miek Gieben <miek@miek.nl>
Signed-off-by: Miek Gieben <miek@miek.nl>
Signed-off-by: Miek Gieben <miek@miek.nl>
update readme
Some checks failed
ci/woodpecker/push/build Pipeline failed
ci/woodpecker/pr/build Pipeline failed
0fe4b89ae3 
Signed-off-by: Miek Gieben <miek@miek.nl>
Signed-off-by: Miek Gieben <miek@miek.nl>
Signed-off-by: Miek Gieben <miek@miek.nl>
Signed-off-by: Miek Gieben <miek@miek.nl>
Add some functions
Some checks failed
ci/woodpecker/pr/build Pipeline failed
ci/woodpecker/push/build Pipeline failed
db6b80eaed 
Signed-off-by: Miek Gieben <miek@miek.nl>
more
Some checks failed
ci/woodpecker/push/build Pipeline failed
ci/woodpecker/pr/build Pipeline failed
8eaf8ad841 
Signed-off-by: Miek Gieben <miek@miek.nl>
fix
Some checks failed
ci/woodpecker/pr/build Pipeline failed
ci/woodpecker/push/build Pipeline failed
ci/woodpecker/pull_request_metadata/build Pipeline was successful
c9c3632eaf 
Signed-off-by: Miek Gieben <miek@miek.nl>
miekg changed title from (削除) miek/2025-10-18@2017 (削除ここまで) to GOTMPL rr 2025年10月23日 16:13:11 +02:00
Some checks failed
ci/woodpecker/pr/build Pipeline failed
ci/woodpecker/push/build Pipeline failed
ci/woodpecker/pull_request_metadata/build Pipeline was successful
This pull request has changes conflicting with the target branch.
  • cmd/atomdns/Conffile-example
  • cmd/atomdns/handlers/global/README.md
  • cmd/atomdns/handlers/template/README.md
  • cmd/atomdns/handlers/template/template.go
  • cmd/atomdns/man/atomdns-global.7
  • cmd/atomdns/man/atomdns-template.7
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin miek/2025-10-18@2017:miek/2025-10-18@2017
git switch miek/2025-10-18@2017

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff miek/2025-10-18@2017
git switch miek/2025-10-18@2017
git rebase main
git switch main
git merge --ff-only miek/2025-10-18@2017
git switch miek/2025-10-18@2017
git rebase main
git switch main
git merge --no-ff miek/2025-10-18@2017
git switch main
git merge --squash miek/2025-10-18@2017
git switch main
git merge --ff-only miek/2025-10-18@2017
git switch main
git merge miek/2025-10-18@2017
git push origin main
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
miekg/dns!322
Reference in a new issue
miekg/dns
No description provided.
Delete branch "miek/2025-10-18@2017"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?