tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a35895c 4a32628)

author	Florian Forster <octo@collectd.org>
	Wed, 30 Aug 2017 11:34:28 +0000 (13:34 +0200)
committer	Florian Forster <octo@collectd.org>
	Wed, 30 Aug 2017 11:34:28 +0000 (13:34 +0200)
commit	4380983e0a45e2d1c1207dbea95863d1dcc844c6
tree	444098e7bf90e0aee9fe0e1251c4218a6c285d70	tree \| snapshot
parent	a35895c171ea67c7c707f98f49134236f9143c53	commit \| diff
parent	4a3262890ccdf889feeae9b48d612818ec571c67	commit \| diff

Merge remote-tracking branch 'github/pr/2258'

Makefile.am	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
src/collectd-nagios.c	diff1 \|	diff2 \|	blob \| history
src/collectd-tg.c	diff1 \|	diff2 \|	blob \| history
src/collectdctl.c	diff1 \|	diff2 \|	blob \| history
src/libcollectdclient/client.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)