Skip to content

Commit 1b8c8a1

Browse files
authored
Merge pull request #8898 from joshcooper/merge_6x_main_mar17
(maint) Merge 6.x to main
2 parents 093c708 + f10589c commit 1b8c8a1

File tree

4 files changed

+1
-77
lines changed

4 files changed

+1
-77
lines changed

Diff for: .hound.yml

-2
This file was deleted.

Diff for: acceptance/tests/resource/file/ticket_8740_should_not_enumerate_root_directory.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
test_name "#8740: should not enumerate root directory"
22

33
confine :except, :platform => 'windows'
4-
confine :except, :platform => /(osx-10.1[5-9]|osx-11-)/
4+
confine :except, :platform => 'osx'
55

66
tag 'audit:high',
77
'audit:refactor', # Use block style `test_name`

Diff for: acceptance/tests/resource/user/should_modify_home.rb

-37
This file was deleted.

Diff for: acceptance/tests/resource/user/should_modify_uid.rb

-37
This file was deleted.

0 commit comments

Comments
 (0)