Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-06 00:28:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Seth Hall 2012-07-10 20:32:42 -04:00
commit 728888ad45
17 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/logging/Manager.cc
View file

@ -992,7 +992,7 @@ WriterFrontend* Manager::CreateWriter(EnumVal* id, EnumVal* writer, const Writer
if ( ! stream )
// Don't know this stream.
return false;
return 0;
Stream::WriterMap::iterator w =
stream->writers.find(Stream::WriterPathPair(writer->AsEnum(), info.path));