Merge remote-tracking branch 'origin/topic/dnthayer/broker-namespace'

* origin/topic/dnthayer/broker-namespace:
  Split the broker main.bro into two scripts
  Rename the BrokerStore namespace to Broker
  Rename the BrokerComm namespace to Broker

BIT-1563 #merged
This commit is contained in:
Johanna Amann 2016-04-22 16:25:33 -07:00
commit e7ec537ed5
97 changed files with 1240 additions and 1220 deletions

View file

@ -37,7 +37,7 @@
@load base/frameworks/reporter
@load base/frameworks/sumstats
@load base/frameworks/tunnels
@ifdef ( BrokerComm::enable )
@ifdef ( Broker::enable )
@load base/frameworks/openflow
@load base/frameworks/netcontrol
@endif