(maint) update submodule versions and agent pin

puppetlabs · Apr 19, 2024 · bf25ffa · bf25ffa
1 parent 4016f79
commit bf25ffa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/acceptance/config/beaker/options.rb b/acceptance/config/beaker/options.rb
@@ -11,5 +11,5 @@
  "puppetserver-confdir"=>"/etc/puppetlabs/puppetserver/conf.d",
  "puppetserver-config"=>
   "/etc/puppetlabs/puppetserver/conf.d/puppetserver.conf",
- :puppet_build_version=>"834da4a5b2757163375562a19c3e2dfa4f968df9",
+ :puppet_build_version=>"12b5258bd4fcdedc8ecf0008e87588fa623850bb",
  :ssh=>{:config=>true}}
diff --git a/ruby/puppet b/ruby/puppet
+4 −1		.gemspec
+20 −2		lib/puppet/util/command_line/trollop.rb
+604 −600		locales/puppet.pot
+77 −0		spec/unit/util/command_line_utils/puppet_option_parser_spec.rb