(maint) Merge '7.x' into 'main' - Githubissues

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 '7.x' into 'main' #2779

Closed justinstoller closed 1 year ago

justinstoller commented 1 year ago

Resolves conflicts with 'ours' option Conflicts:

project.clj (project version bumps)
acceptance/config/beaker/options.rb (puppet agent bumps)
all acceptance .pems (they were already refreshed in main)