Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Correct a typo in controller.bro documentation
This commit is contained in:
Robin Sommer 2015-10-23 14:05:29 -07:00
commit cf4fcf5751

View file

@ -4,7 +4,7 @@
##! ##!
##! It's intended to be used from the command line like this:: ##! It's intended to be used from the command line like this::
##! ##!
##! bro <scripts> frameworks/control/controller Control::host=<host_addr> Control::port=<host_port> Control::cmd=<command> [Control::arg=<arg>] ##! bro <scripts> frameworks/control/controller Control::host=<host_addr> Control::host_port=<host_port> Control::cmd=<command> [Control::arg=<arg>]
@load base/frameworks/control @load base/frameworks/control
@load base/frameworks/communication @load base/frameworks/communication