Skip to content

Commit 3ea5176

Browse files
committed
Merge remote-tracking branch 'puppetlabs/6.x' into main
* puppetlabs/6.x: (maint) Retrieve only stdout for `puppet facts diff` (packaging) Updating manpage file for 6.x (packaging) Updating the puppet.pot file (PUP-10985) Output facts existing only in Facter 4 via `diff` action # Conflicts: # lib/puppet/face/facts.rb # lib/puppet/util/fact_dif.rb # locales/puppet.pot # man/man8/puppet-facts.8 # spec/unit/application/facts_spec.rb
2 parents b65c18f + 9b390bc commit 3ea5176

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)