![[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) |
Conflicts:
src/collectd.conf.pod
src/collectd.conf.pod
| 1 | 2 | |||
|---|---|---|---|---|
| src/collectd.conf.pod | patch | | diff1 | | diff2 | | blob | history |
| src/common.c | patch | | diff1 | | diff2 | | blob | history |
| src/configfile.c | patch | | diff1 | | diff2 | | blob | history |
| src/types.db | patch | | diff1 | | diff2 | | blob | history |
| src/varnish.c | patch | | diff1 | | diff2 | | blob | history |
| src/write_riemann.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/common.c
Simple merge
diff --cc src/configfile.c
Simple merge
diff --cc src/types.db
Simple merge
diff --cc src/varnish.c
Simple merge
diff --cc src/write_riemann.c
Simple merge