No description
Find a file
Robin Sommer a646fde884 Merge remote-tracking branch 'origin/topic/seth/unified2-analyzer' into topic/robin/unified2-analyzer-merge
* origin/topic/seth/unified2-analyzer:
  Fixed a problem where the Unified2 analyzer was attached to every file.
  Fixing intel framework tests.
  Updating submodule(s).
  Add file name support to intel framework.
  Add file support to intel framework and slightly restructure intel http handling.

Conflicts:
	CHANGES
	VERSION
	scripts/base/files/unified2/main.bro
	testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
	testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
2013-08-14 10:27:26 -07:00
aux Updating submodule(s). 2013-08-13 18:44:13 -07:00
cmake@370f7efc6e Updating submodule. 2013-08-09 15:34:32 -07:00
doc Merge remote-tracking branch 'origin/master' into topic/seth/unified2-analyzer 2013-08-14 00:54:41 -04:00
magic@e87fe13a7b Updating submodule(s). 2013-07-30 10:29:27 -07:00
pkg Adjusting Mac binary packaging script. 2012-09-13 16:47:40 -05:00
scripts Merge remote-tracking branch 'origin/topic/seth/unified2-analyzer' into topic/robin/unified2-analyzer-merge 2013-08-14 10:27:26 -07:00
src Merge remote-tracking branch 'origin/master' into topic/seth/unified2-analyzer 2013-08-14 00:54:41 -04:00
testing Merge remote-tracking branch 'origin/topic/seth/unified2-analyzer' into topic/robin/unified2-analyzer-merge 2013-08-14 10:27:26 -07:00
.gitignore Ignore tmp dir. 2011-10-25 19:59:25 -07:00
.gitmodules Make the custom libmagic database a git submodule. 2013-07-10 14:06:51 -05:00
bro-path-dev.in Infrastructure for modularizing protocol analyzers. 2013-03-29 19:59:31 -07:00
CHANGES Merge remote-tracking branch 'origin/topic/seth/unified2-analyzer' into topic/robin/unified2-analyzer-merge 2013-08-14 10:27:26 -07:00
CMakeLists.txt Make the custom libmagic database a git submodule. 2013-07-10 14:06:51 -05:00
config.h.in Merge remote-tracking branch 'origin/master' into topic/seth/elasticsearch 2012-07-06 12:01:16 -04:00
configure Teach --disable-dataseries/--disable-elasticsearch to ./configure. 2012-10-08 16:45:04 -05:00
COPYING A set of script-reference polishing. 2012-01-09 18:04:34 -08:00
INSTALL s/bro-ids.org/bro.org/g 2013-03-07 19:33:04 -08:00
Makefile Adding Makefile target test-all that also runs the BroControl test 2013-05-31 17:32:27 -07:00
NEWS Merge branch 'topic/robin/dnp3-merge-v3' 2013-08-12 11:39:03 -07:00
README s/bro-ids.org/bro.org/g 2013-03-07 19:33:04 -08:00
VERSION Merge remote-tracking branch 'origin/topic/seth/unified2-analyzer' into topic/robin/unified2-analyzer-merge 2013-08-14 10:27:26 -07:00

============================
Bro Network Security Monitor
============================

Bro is a powerful framework for network analysis and security
monitoring. Please see the INSTALL file for installation instructions
and pointers for getting started. NEWS contains release notes for the
current version, and CHANGES has the complete history of changes.
Please see COPYING for licensing information.

For more documentation, research publications, and community contact
information, please see Bro's home page:

    http://www.bro.org

On behalf of the Bro Development Team,

Vern Paxson & Robin Sommer,
International Computer Science Institute &
Lawrence Berkeley National Laboratory
vern@icir.org / robin@icir.org