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

Auto-merge for build 71 See merge request puppet/puppet_cd!67
2025-10-27 12:54:11 +00:00
parent ec48c65966 e803e21d93
commit 2cabcd9a9c
2 changed files with 2 additions and 1 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -26,6 +26,7 @@
        "springframework",
        "startswith",
        "Supress",
+        "sysconfig",
        "trapperkeeper",
        "utcnow",
        "uvicorn",
--- a/templates/puppetdb/puppetdb_service.erb
+++ b/templates/puppetdb/puppetdb_service.erb
@@ -42,7 +42,7 @@ KillMode=process

 SuccessExitStatus=143

-StandardOutput=journald
+StandardOutput=journal

 [Install]
 WantedBy=multi-user.target