Merge remote-tracking branch 'origin/master' into topic/seth/sumstats-updates

Conflicts:
	doc/scripts/DocSourcesList.cmake
	scripts/test-all-policy.bro
This commit is contained in:
Seth Hall 2013-07-30 11:48:03 -04:00
commit 7db531e162
808 changed files with 37774 additions and 19706 deletions

View file

@ -16,7 +16,8 @@ export {
redef record ResultVal += {
## This is the queue where elements are maintained. Use the
## :bro:see:`SumStats::get_elements` function to get a vector of the current element values.
## :bro:see:`SumStats::get_last` function to get a vector of
## the current element values.
last_elements: Queue::Queue &optional;
};