Merge remote-tracking branch 'origin/master' into jenkins-build-9

OP#830 testing fqdn pickup
Merge remote-tracking branch 'origin/master' into jenkins-build-8
2026-10-02 13:52:21 +02:00 · 2026-10-02 13:51:16 +02:00 · 2026-10-02 13:46:09 +02:00
1 changed files with 3 additions and 1 deletions
--- a/templates/chrony.conf.erb
+++ b/templates/chrony.conf.erb
@@ -17,4 +17,6 @@ pool <%= this_server %> iburst
 <%= @fqdn %> 
 <% end -%>

-<% end -%>
+<% end -%>
+
+<%= @fqdn %>
Author	SHA1	Message	Date
Jenkins Server	272946023d	Merge remote-tracking branch 'origin/master' into jenkins-build-9	2026-10-02 13:52:21 +02:00
12ww1160	6603cb6a76	OP#830 testing fqdn pickup	2026-10-02 13:51:16 +02:00
Jenkins Server	1cd3e70afb	Merge remote-tracking branch 'origin/master' into jenkins-build-8	2026-10-02 13:46:09 +02:00