tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 71fb7a5 55ffaf9)

author	Pavel Rochnyack <pavel2000@ngs.ru>
	Fri, 20 Oct 2017 14:00:29 +0000 (21:00 +0700)
committer	Pavel Rochnyack <pavel2000@ngs.ru>
	Fri, 20 Oct 2017 14:00:29 +0000 (21:00 +0700)
commit	0eff2a882a9265fd59d4f7a265c6b6810acb0032
tree	2417aa4921a35d59075f73f1e51ee34fb26d5f45	tree \| snapshot
parent	71fb7a5299f307a9261ae69819318f1eda1dd3c7	commit \| diff
parent	55ffaf9ad7c8b180ac0192adb1a6ff6adc72c5a3	commit \| diff

Merge branch 'collectd-5.7'

src/collectd.conf.pod	diff1 \|	diff2 \|	blob \| history
src/write_prometheus.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)