tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bca0f0a 5e6230c)

author	Marc Fournier <marc.fournier@camptocamp.com>
	Fri, 22 Aug 2014 21:22:34 +0000 (23:22 +0200)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Fri, 22 Aug 2014 21:22:34 +0000 (23:22 +0200)
commit	68108d7b5688f4db5257a90437e50428a88d594a
tree	b294d89b2c7c3ca403f3704a0ca98857bb8610a7	tree \| snapshot
parent	bca0f0af973fcd4b34e3cf6072e193ac9dbc65fc	commit \| diff
parent	5e6230c1597ba02a4fb815d2bd553e64028675f5	commit \| diff

Merge branch 'feature/ZOL'

Conflicts:
configure.ac

AUTHORS	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
contrib/redhat/collectd.spec	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)