Merge remote-tracking branch 'origin/master' into topic/seth/log-framework-ext

This commit is contained in:
Seth Hall 2016-08-10 10:28:04 -04:00
commit a60ce35103
885 changed files with 141119 additions and 120109 deletions

View file

@ -681,8 +681,6 @@ bool Manager::RemoveFilter(EnumVal* id, string name)
bool Manager::Write(EnumVal* id, RecordVal* columns)
{
bool error = false;
Stream* stream = FindStream(id);
if ( ! stream )
return false;
@ -903,9 +901,6 @@ bool Manager::Write(EnumVal* id, RecordVal* columns)
Unref(columns);
if ( error )
RemoveDisabledWriters(stream);
return true;
}