Merge branch 'master' into topic/jsiwek/gridftp

This commit is contained in:
Jon Siwek 2012-10-02 16:39:34 -05:00
commit 2ac6fab5fc
10 changed files with 40 additions and 14 deletions

View file

@ -26,8 +26,10 @@ export {
## e.g. prefix = "bro\_" would create types of bro_dns, bro_software, etc.
const type_prefix = "" &redef;
## The time before an ElasticSearch transfer will timeout.
## This is not working!
## The time before an ElasticSearch transfer will timeout. Note that
## the fractional part of the timeout will be ignored. In particular, time
## specifications less than a second result in a timeout value of 0, which
## means "no timeout."
const transfer_timeout = 2secs;
## The batch size is the number of messages that will be queued up before