![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Fri, 12 Jul 2013 16:23:20 +0000 (18:23 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Fri, 12 Jul 2013 16:23:20 +0000 (18:23 +0200) | ||
| commit | 38d06a8f868293466f4eee943555c65457a5e560 | |
| tree | 2c27d77cdac80c1d0246c01722d15369fc0f41d2 | tree | snapshot |
| parent | a02ced789b4c93f293dc9d14a5a303c5fe11bcce | commit | diff |
| parent | bc389fa32a48a64306f7ec008f4548f05fdb7c80 | commit | diff |
Merge branch 'collectd-5.3'
Conflicts:
src/collectd.conf.pod
Conflicts:
src/collectd.conf.pod
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/common.c | diff1 | | diff2 | | blob | history |
| src/configfile.c | diff1 | | diff2 | | blob | history |
| src/types.db | diff1 | | diff2 | | blob | history |
| src/varnish.c | diff1 | | diff2 | | blob | history |
| src/write_riemann.c | diff1 | | diff2 | | blob | history |