HD Moore
|
dc75ca2edd
|
Merge branch 'master' into feature/add-json-output
Conflicts:
INSTALL
|
2013-08-17 14:49:17 -05:00 |
|
HD Moore
|
c6f21fdeca
|
Small typo fix to a comment
|
2013-08-17 14:46:55 -05:00 |
|
HD Moore
|
36564d8bb5
|
Add module names and gw mac address to output
|
2013-08-17 14:44:29 -05:00 |
|
HD Moore
|
9d31ee1a62
|
Add json_file output format (uses json-c)
|
2013-08-17 14:02:23 -05:00 |
|
HD Moore
|
2e6261720f
|
This is the last commit needed to build with REDIS
|
2013-08-17 10:38:57 -05:00 |
|
Eric
|
597a0c252e
|
remove ssldb and fix redis callback
|
2013-08-17 02:35:27 -04:00 |
|
Zakir Durumeric
|
30081f5cf5
|
fixing incorrect include in redis output module
|
2013-08-16 11:17:09 -04:00 |
|
Zakir Durumeric
|
490054d239
|
inital public release
|
2013-08-16 11:12:47 -04:00 |
|