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

puppetlabs / puppetserver

Server automation framework and application

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

Apache License 2.0

292 stars 235 forks source link

(maint) Merge branch '7.x' into branch 'main' #2840

Closed justinstoller closed 5 months ago

justinstoller commented 5 months ago

Conflicts:

acceptance/config/beaker/options.rb
acceptance/scripts/generic/testrun.sh
project.clj