Merge tag 'v0.20.7'

release v0.20.7
2017-05-15 23:01:49 +02:00
parent 89b900432e b4c9d9c2a7
commit 4faef28cc5
289 changed files with 914 additions and 924 deletions
--- a/src/output/plugins/httpd/HttpdOutputPlugin.cxx
+++ b/src/output/plugins/httpd/HttpdOutputPlugin.cxx
@@ -300,7 +300,7 @@ HttpdOutput::SendHeader(HttpdClient &client) const
 }

 inline std::chrono::steady_clock::duration
-HttpdOutput::Delay() const
+HttpdOutput::Delay() const noexcept
 {
 	if (!LockHasClients() && base.pause) {
 		/* if there's no client and this output is paused,