]> arthur.barton.de Git - netdata.git/commitdiff
projects / netdata.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67509fe 155d0e6)
Merge branch 'master' into ab-debian
authorAlexander Barton <alex@barton.de>
Sat, 25 Feb 2017 20:14:06 +0000 (21:14 +0100)
committerAlexander Barton <alex@barton.de>
Sat, 25 Feb 2017 20:14:06 +0000 (21:14 +0100)
* master:
  set up-delay on web alarms; fixes #1832
  fail2ban_plugin: parse both conf_path and conf_dir/; regex update


Trivial merge
NetData