Merge remote-tracking branch 'origin/topic/jsiwek/reorg-followup'

This commit is contained in:
Seth Hall 2011-08-25 16:44:31 -04:00
commit fc5f22cb5d
234 changed files with 295 additions and 104 deletions

View file

@ -1,5 +1,7 @@
@load ./main
@load base/frameworks/communication/main
@load base/frameworks/communication
@if ( Cluster::node in Cluster::nodes )
module Cluster;
@ -79,3 +81,5 @@ event bro_init() &priority=9
}
}
}
@endif