Merge branch 'jenkins-build-20' into 'master'

Auto-merge for build 20 See merge request puppet/confdroid_ssh!20
Merge remote-tracking branch 'origin/master' into jenkins-build-20
2026-04-13 14:21:24 +02:00 · 2026-04-13 14:02:06 +02:00 · 2026-04-13 14:01:47 +02:00 · 2026-04-13 11:52:20 +00:00
1 changed files with 3 additions and 1 deletions
--- a/templates/sshd_custom_conf.erb
+++ b/templates/sshd_custom_conf.erb
@@ -28,4 +28,6 @@ AuthorizedKeysFile	<%= @ssh_auth_key_files %>

 AuthorizedPrincipalsFile <%= @ssh_authorized_principals_file %>
 AuthorizedKeysCommand <%= @ssh_authorized_keys_command %>
-AuthorizedKeysCommandUser <%= @ssh_authorized_keys_command_user %>
+AuthorizedKeysCommandUser <%= @ssh_authorized_keys_command_user %>
+
+# test
Author	SHA1	Message	Date
Jenkins	ff1b182150	Merge branch 'jenkins-build-20' into 'master' Auto-merge for build 20 See merge request puppet/confdroid_ssh!20	2026-04-13 14:21:24 +02:00
Jenkins Server	e9d5d6516c	Merge remote-tracking branch 'origin/master' into jenkins-build-20	2026-04-13 14:02:06 +02:00
12ww1160	3feb4f0de7	OP#575 fix ordering	2026-04-13 14:01:47 +02:00
Jenkins	a3844a7e5f	Merge branch 'jenkins-build-19' into 'master' Auto-merge for build 19 See merge request puppet/confdroid_ssh!19	2026-04-13 11:52:20 +00:00