(maint) Merge 'origin/7.x' into 'origin/main'

puppetlabs / puppetserver

Server automation framework and application

https://tickets.puppetlabs.com/browse/SERVER

Apache License 2.0

292 stars 236 forks source link

(maint) Merge 'origin/7.x' into 'origin/main' #2747

Closed justinstoller closed 1 year ago

justinstoller commented 1 year ago

Conflicts:

src/clj/puppetlabs/puppetserver/certificate_authority.clj
src/clj/puppetlabs/services/ca/certificate_authority_core.clj

justinstoller commented 1 year ago

Having a weird CA related test failure locally. Wanted to put this up and see if it reproduced in PR testing.

justinstoller commented 1 year ago

The failures do not seem to be related to the merge up but instead to some existing limitations in the auto-renewal feature (which is a WIP) vs FIPS. Merging.