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

extra rules with NIDS, HIDS, ansible, critical-stack, ... #195

Closed
wants to merge 1 commit into from

Conversation

juju4
Copy link
Contributor

@juju4 juju4 commented Jan 22, 2017

merge part of rules from my testing environment.
comments welcome

@mstemm
Copy link
Contributor

mstemm commented Jan 25, 2017

I've been working on a very similar set of changes that I just merged in #196, so there are a lot of conflicts now.

I'd be happy to take these changes, resolve the conflics myself, and then prepare a new PR with your changes. Is that ok with you? The commits would have my name, but I'd be happy to give you credit in the PR and commit notes.

Does that sound reasonable?

@juju4
Copy link
Contributor Author

juju4 commented Jan 25, 2017

As you wish, whoever got the time first. I might be able to do this weekend.
If you can before, go :)

@mstemm
Copy link
Contributor

mstemm commented Jan 27, 2017

I had time to merge the existing changes with your changes, and opened #200. I'll close this PR and we can work through the changes in the new PR.

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.

2 participants