Merge branch 'jenkins-build-71' into 'master'
Auto-merge for build 71 See merge request puppet/puppet_cd!67
This commit is contained in:
1
.vscode/settings.json
vendored
1
.vscode/settings.json
vendored
@@ -26,6 +26,7 @@
|
|||||||
"springframework",
|
"springframework",
|
||||||
"startswith",
|
"startswith",
|
||||||
"Supress",
|
"Supress",
|
||||||
|
"sysconfig",
|
||||||
"trapperkeeper",
|
"trapperkeeper",
|
||||||
"utcnow",
|
"utcnow",
|
||||||
"uvicorn",
|
"uvicorn",
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ KillMode=process
|
|||||||
|
|
||||||
SuccessExitStatus=143
|
SuccessExitStatus=143
|
||||||
|
|
||||||
StandardOutput=journald
|
StandardOutput=journal
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
|||||||
Reference in New Issue
Block a user