arthur.barton.de Git - netdata.git/commit

author	Alexander Barton <alex@barton.de>
	Sat, 25 Feb 2017 20:14:06 +0000 (21:14 +0100)
committer	Alexander Barton <alex@barton.de>
	Sat, 25 Feb 2017 20:14:06 +0000 (21:14 +0100)
commit	1464189ade598ed6842fb9a0e7d4cda09bc53758
tree	10608c0054b198011c42b37cfadbb34b14a85c1b	tree \| snapshot
parent	67509feacb502eddf487ce5ac6b12ce2903bc0be	commit \| diff
parent	155d0e6fbdf23b5858485e5908d91f0c529e2a77	commit \| diff

Merge branch 'master' into ab-debian

* master:
set up-delay on web alarms; fixes #1832
fail2ban_plugin: parse both conf_path and conf_dir/; regex update