![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Pierre-Yves Ritschard <pyr@spootnik.org> | |
| Fri, 17 Jan 2014 12:17:12 +0000 (13:17 +0100) | ||
| committer | Pierre-Yves Ritschard <pyr@spootnik.org> | |
| Fri, 17 Jan 2014 12:17:12 +0000 (13:17 +0100) | ||
| commit | 72ec1d0ed6cde4aa78f17d031e7a48e37cbf7a57 | |
| tree | 1cdae5582a250ed608078a9f287dbf88dc650296 | tree | snapshot |
| parent | ca8b50eff1e9341159416c8b53f2d1d11b99591b | commit | diff |
| parent | ab4488bbc2f371fd7bfb1c3659471160dfdbc2cb | commit | diff |
Merge branch 'feature-log-logstash' of github.com:pyr/collectd into feature-log-logstash
Conflicts:
configure.ac
Conflicts:
configure.ac
| configure.ac | diff1 | | | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |