Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add waiver for file_permission_user_init_files_root disa misalignment #173

Merged

Conversation

vojtapolasek
Copy link
Contributor

@vojtapolasek vojtapolasek commented May 3, 2024

@vojtapolasek vojtapolasek force-pushed the add_user_init_files_stig branch from 19b827b to 6bc9847 Compare May 3, 2024 08:32
@vojtapolasek vojtapolasek changed the title file_permission_user_init_files_root add waiver for file_permission_user_init_files_root disa misalignment May 3, 2024
@vojtapolasek vojtapolasek force-pushed the add_user_init_files_stig branch from 6bc9847 to 9575976 Compare May 3, 2024 12:05
@mildas
Copy link
Contributor

mildas commented May 3, 2024

@vojtapolasek please rebase and fix conflicts

@mildas
Copy link
Contributor

mildas commented May 6, 2024

@vojtapolasek after I merged the other PR, this one started to conflict again. Please rebase

@comps
Copy link
Contributor

comps commented May 6, 2024

Btw, when adding commits like this gradually over the course of 1-2 days, it's best to just push them to the same PR, so you don't create conflicts. The PR doesn't mind being updated over time (commits added).

@vojtapolasek vojtapolasek force-pushed the add_user_init_files_stig branch from 9575976 to 03b490b Compare May 6, 2024 14:45
@mildas mildas merged commit b3c8a70 into RHSecurityCompliance:main May 6, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants