Merge branch 'master' into direct-rdata-storage

NLnetLabs · Jan 15, 2025 · b17c65e · b17c65e
2 parents abaccc4 + efda9cb
commit b17c65e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,3 +1,6 @@
+15 January 2025: Wouter
+	- Fix whitespace in comment.
+
 7 January 2025: Willem
 	- Fix #421: old-main can quit before the reload process received        
 	  from old-main that it is done on the reload_listener pipe.                    

diff --git a/doc/RELNOTES b/doc/RELNOTES
@@ -8,6 +8,7 @@ BUG FIXES:
 	- Fix #421: old-main can quit before the reload process received        
 	  from old-main that it is done on the reload_listener pipe.            
 	  Thanks Otto Retter. 
+	- Fix whitespace in comment.
 
 4.11.0
 ================