Code

Merge branch 'sh/plugin_interval'
authorFlorian Forster <octo@collectd.org>
Fri, 16 Nov 2012 06:53:27 +0000 (07:53 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 16 Nov 2012 06:55:52 +0000 (07:55 +0100)
commit6d85a198dd90fb5af963ad847d9dbff7b8025c46
treeaf5fe7c5e00085d103ad84723d2b35b88232ecda
parente2bdca73d28ff16ab23af1d8eec984badb1a2513
parent9cb2694409620ae217ede92f78fe45c9eba83504
Merge branch 'sh/plugin_interval'

Conflicts:
src/amqp.c
src/exec.c
src/memcached.c
src/unixsock.c
19 files changed:
src/amqp.c
src/collectd.c
src/collectd.conf.pod
src/configfile.c
src/configfile.h
src/disk.c
src/email.c
src/exec.c
src/network.c
src/perl.c
src/pinba.c
src/ping.c
src/plugin.c
src/plugin.h
src/postgresql.c
src/python.c
src/rrdtool.c
src/snmp.c
src/unixsock.c