Skip to content

Commit 9026ec7

Browse files
authored
Merge pull request #8546 from luchihoratiu/maint_fix-exclude-list
(maint) Fix exclude_list for `puppet facts diff`
2 parents 179e333 + 9c9ca49 commit 9026ec7

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lib/puppet/face/facts.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
memory\.swap\.available memory\.swap\.capacity memory\.swap\.used
1212
memory\.system\.available_bytes memory\.system\.used_bytes
1313
memory\.system\.available memory\.system\.capacity memory\.system\.used
14-
mountpoints\..*\.available* mountpoints\..*\.capacity mountpoints\..*\.used*
14+
mountpoints\..*\.available.* mountpoints\..*\.capacity mountpoints\..*\.used.*
1515
sp_uptime system_profiler\.uptime
1616
uptime uptime_days uptime_hours uptime_seconds
1717
system_uptime\.uptime system_uptime\.days system_uptime\.hours system_uptime\.seconds

spec/integration/http/client_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
end
154154

155155
context 'ciphersuites' do
156-
it "does not connect when using an SSLv3 ciphersuite" do
156+
it "does not connect when using an SSLv3 ciphersuite", :if => Puppet::Util::Package.versioncmp(OpenSSL::OPENSSL_LIBRARY_VERSION.split[1], '1.1.1e') > 0 do
157157
Puppet[:ciphers] = "DES-CBC3-SHA"
158158

159159
https_server.start_server do |port|

0 commit comments

Comments
 (0)