tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e2bdca7 9cb2694)

author	Florian Forster <octo@collectd.org>
	Fri, 16 Nov 2012 06:53:27 +0000 (07:53 +0100)
committer	Florian Forster <octo@collectd.org>
	Fri, 16 Nov 2012 06:55:52 +0000 (07:55 +0100)
commit	6d85a198dd90fb5af963ad847d9dbff7b8025c46
tree	af5fe7c5e00085d103ad84723d2b35b88232ecda	tree \| snapshot
parent	e2bdca73d28ff16ab23af1d8eec984badb1a2513	commit \| diff
parent	9cb2694409620ae217ede92f78fe45c9eba83504	commit \| diff

Merge branch 'sh/plugin_interval'

Conflicts:
src/amqp.c
src/exec.c
src/memcached.c
src/unixsock.c

19 files changed:

src/amqp.c	diff1 \|	diff2 \|	blob \| history
src/collectd.c	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	diff1 \|	diff2 \|	blob \| history
src/configfile.c	diff1 \|	diff2 \|	blob \| history
src/configfile.h	diff1 \|	diff2 \|	blob \| history
src/disk.c	diff1 \|	diff2 \|	blob \| history
src/email.c	diff1 \|	diff2 \|	blob \| history
src/exec.c	diff1 \|	diff2 \|	blob \| history
src/network.c	diff1 \|	diff2 \|	blob \| history
src/perl.c	diff1 \|	diff2 \|	blob \| history
src/pinba.c	diff1 \|	diff2 \|	blob \| history
src/ping.c	diff1 \|	diff2 \|	blob \| history
src/plugin.c	diff1 \|	diff2 \|	blob \| history
src/plugin.h	diff1 \|	diff2 \|	blob \| history
src/postgresql.c	diff1 \|	diff2 \|	blob \| history
src/python.c	diff1 \|	diff2 \|	blob \| history
src/rrdtool.c	diff1 \|	diff2 \|	blob \| history
src/snmp.c	diff1 \|	diff2 \|	blob \| history
src/unixsock.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)