(maint) Merge up 2c45f08 to main

puppetlabs-jenkins · puppetlabs-jenkins · commit 053ee58b62ab · 2022-02-13T18:34:39.000-08:00
Generated by CI * commit '2c45f08363435d7229c647cdc814eb436ba20b25': (PUP-11435) Remove Facter.reset to prevent puppet-enterprise-modules from breaking
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
@@ -1995,7 +1995,6 @@ def self.initialize_default_settings!(settings)
       :hook => proc do |value|
         paths = value.split(File::PATH_SEPARATOR)
         facter = Puppet.runtime[:facter]
-        facter.reset
         facter.search(*paths)
       end
     }

Original file line number	Diff line number	Diff line change
`@@ -1995,7 +1995,6 @@ def self.initialize_default_settings!(settings)`
`1995`	`1995`	`:hook => proc do \|value\|`
`1996`	`1996`	`paths = value.split(File::PATH_SEPARATOR)`
`1997`	`1997`	`facter = Puppet.runtime[:facter]`
`1998`		`- facter.reset`
`1999`	`1998`	`facter.search(*paths)`
`2000`	`1999`	`end`
`2001`	`2000`	`}`