]> git.tokkee.org Git - collectd.git/commit

tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1b6906d 363bd03)

author	Marc Fournier <marc.fournier@camptocamp.com>
	Tue, 19 May 2015 11:34:10 +0000 (13:34 +0200)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Tue, 19 May 2015 11:34:10 +0000 (13:34 +0200)
commit	8395c8dbb8f5a872c5cde8db4c47a34cdb5f7c2f
tree	e1db34b90304fce85e4885b7c0eae2c5f86d0041	tree \| snapshot
parent	1b6906d2288a984af21f43aabc3d71d3d1024b1b	commit \| diff
parent	363bd0300297144a29b58cc813b23d9353525178	commit \| diff

Merge remote-tracking branch 'origin/pr/651'

Conflicts:
contrib/redhat/collectd.spec

AUTHORS	diff1 \|	diff2 \|	blob \| history
README	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
src/collectd.conf.in	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)