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

Changing an error in the input framework to a warning.

Browse source
This commit is contained in:
Robin Sommer 2012-06-15 16:24:52 -07:00
parent 464732bfce
commit 41ef1072ec
8 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -1,4 +1,9 @@
2.0-623 | 2012-06-15 16:24:52 -0700
* Changing an error in the input framework to a warning. (Robin
Sommer)
2.0-622 | 2012-06-15 15:38:43 -0700 2.0-622 | 2012-06-15 15:38:43 -0700
* Input framework updates. (Bernhard Amann) * Input framework updates. (Bernhard Amann)

2
VERSION
View file

@ -1 +1 @@
2.0-622 2.0-623

2
aux/binpac

@ -1 +1 @@
Subproject commit 6f43a8115d8e6483a50957c5d21c5d69270ab3aa Subproject commit b4094cb75e0a7769123f7db1f5d73f3f9f1c3977

2
aux/bro-aux

@ -1 +1 @@
Subproject commit c6391412e902e896836450ab98910309b2ca2d9b Subproject commit f938c81ada94641ab5f0231983edc2ba866b9a1f

2
aux/broccoli

@ -1 +1 @@
Subproject commit 0d139c09d5a9c8623ecc2a5f395178f0ddcd7e16 Subproject commit 4e17842743fef8df6abf0588c7ca86c6937a2b6d

2
aux/broctl

@ -1 +1 @@
Subproject commit 880f3e48d33bb28d17184656f858a4a0e2e1574c Subproject commit 589cb04c3d7e28a81aa07454e2b9b6b092f0e1af

2
aux/btest

@ -1 +1 @@
Subproject commit 585645371256e8ec028cabae24c5f4a2108546d2 Subproject commit 4697bf4c8046a3ab7d5e00e926c5db883cb44664

4
src/input/Manager.cc
View file

@ -696,8 +696,8 @@ bool Manager::RemoveStream(Stream *i)
if ( i->removed ) if ( i->removed )
{ {
reporter->Error("Stream %s is already queued for removal. Ignoring remove.", i->name.c_str()); reporter->Warning("Stream %s is already queued for removal. Ignoring remove.", i->name.c_str());
return false; return true;
} }
i->removed = true; i->removed = true;