Merge branch 'master' into alerting

2016-06-25 09:56:57 -04:00
parent dd8c3d0355 23345c563c
commit 346ca3fc89
23 changed files with 286 additions and 87 deletions
@@ -251,7 +251,7 @@ templates_pattern = emails/*.html
 # Use space to separate multiple modes, e.g. "console file"
 mode = console, file

-# Either "trace", "debug", "info", "warn", "error", "critical", default is "info"
+# Either "debug", "info", "warn", "error", "critical", default is "info"
 level = info

 # For "console" mode only