Merge remote-tracking branch 'origin/master' into flakes

This commit is contained in:
Eelco Dolstra 2020-07-08 15:55:19 +02:00
commit 9223603908
2 changed files with 1 additions and 2 deletions

View file

@ -81,7 +81,7 @@ struct TunnelLogger : public Logger
showErrorInfo(oss, ei, false);
StringSink buf;
buf << STDERR_NEXT << oss.str() << "\n";
buf << STDERR_NEXT << oss.str();
enqueueMsg(*buf.s);
}

View file

@ -81,7 +81,6 @@ public:
log(ei.level, oss.str());
}
void startActivity(ActivityId act, Verbosity lvl, ActivityType type,
const std::string & s, const Fields & fields, ActivityId parent)