]> git.ipfire.org Git - thirdparty/snort3.git/commit
projects / thirdparty / snort3.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d284ef2) | patch
Merge pull request #1228 in SNORT/snort3 from move_json_usock to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Wed, 16 May 2018 19:53:05 +0000 (15:53 -0400)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Wed, 16 May 2018 19:53:05 +0000 (15:53 -0400)
commitadcabdb3751d98833a0fefa7c022e416d52ca6af
tree12e3d846a46c7f53ba81ca98bea51e71df6e9924tree
parentd284ef2b36d143f5827cce053f7be74f05c78df9commit | diff
Merge pull request #1228 in SNORT/snort3 from move_json_usock to master

Squashed commit of the following:

commit 5673495422fa4f6069b782fe7db46e186d98822d
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Wed May 16 14:48:55 2018 -0400

    alert: moved alert json. unixsock out from extra to snort3
extra/src/loggers/CMakeLists.txt diff | blob | blame | history
extra/src/loggers/alert_json/CMakeLists.txt [deleted file] blob | blame | history
extra/src/loggers/alert_unixsock/CMakeLists.txt [deleted file] blob | blame | history
src/loggers/CMakeLists.txt diff | blob | blame | history
src/loggers/alert_json.cc [moved from extra/src/loggers/alert_json/alert_json.cc with 99% similarity] diff | blob | blame | history
src/loggers/alert_unixsock.cc [moved from extra/src/loggers/alert_unixsock/alert_unixsock.cc with 92% similarity] diff | blob | blame | history
src/loggers/loggers.cc diff | blob | blame | history
Mirror of https://github.com/snort3/snort3.git