Sebastian Harl [Sun, 27 Apr 2008 18:53:49 +0000 (20:53 +0200)]
perl plugin, Collectd.pm: Added support to flush Perl plugins.
Perl plugins may now register a callback of type Collectd::TYPE_FLUSH. A
single integer argument, representing the timeout in seconds, will be
passed to such callbacks.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 29 Apr 2008 15:44:26 +0000 (17:44 +0200)]
Merge branch 'collectd-4.3' into collectd-4.4
Florian Forster [Tue, 29 Apr 2008 15:43:27 +0000 (17:43 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Tue, 29 Apr 2008 15:43:19 +0000 (17:43 +0200)]
Merge branch 'collectd-4.2' of git://git.verplant.org/collectd into collectd-4.2
Florian Forster [Tue, 29 Apr 2008 15:43:04 +0000 (17:43 +0200)]
Merge branch 'collectd-4.3' of git://git.verplant.org/collectd into collectd-4.3
Florian Forster [Tue, 29 Apr 2008 14:52:08 +0000 (16:52 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3
Conflicts:
src/Makefile.am
Florian Forster [Tue, 29 Apr 2008 09:34:22 +0000 (11:34 +0200)]
build system: Use pkg-config to determine flags for the statgrab library.
Florian Forster [Tue, 29 Apr 2008 08:27:38 +0000 (10:27 +0200)]
build system: Don't (accidentally) clear the LDFLAGS when checking for libxml2 or libvirt.
Florian Forster [Tue, 22 Apr 2008 11:18:21 +0000 (13:18 +0200)]
Bumped version to 4.3.3; Updated ChangeLog.
Florian Forster [Tue, 22 Apr 2008 11:17:05 +0000 (13:17 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Tue, 22 Apr 2008 11:16:34 +0000 (13:16 +0200)]
ChangeLog: Add missing notes about _REENTRANT and the sensors plugin.
Florian Forster [Tue, 22 Apr 2008 11:11:46 +0000 (13:11 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3
Conflicts:
ChangeLog
version-gen.sh
Florian Forster [Tue, 22 Apr 2008 08:28:20 +0000 (10:28 +0200)]
Bumped version to 4.2.7; Updated ChangeLog.
Sebastian Harl [Fri, 18 Apr 2008 12:54:50 +0000 (14:54 +0200)]
migrate-3-4.px: Rename vs_processes's data source from "total" to "value".
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@verplant.org>
Sebastian Harl [Fri, 18 Apr 2008 12:53:50 +0000 (14:53 +0200)]
collection.cgi: Updated "vserver" graph definitions to version 4.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@verplant.org>
Florian Forster [Sun, 20 Apr 2008 08:25:07 +0000 (10:25 +0200)]
teamspeak2 plugin: Remove some debug messages.
Florian Forster [Sun, 20 Apr 2008 08:20:44 +0000 (10:20 +0200)]
teamspeak2 plugin: Be case-insensitive when checking for errors.
Apparently the error and okay messages may have different cases..
Florian Forster [Sun, 20 Apr 2008 08:19:40 +0000 (10:19 +0200)]
teamspeak2 plugin: Collect `servers' and `channels', too.
Florian Forster [Fri, 18 Apr 2008 05:23:48 +0000 (07:23 +0200)]
sensors plugin: Fix the return status of `sensors_snprintf_chip_name'.
The function should return <0 only if an error occured, but in two out of three
branches the initial status of -1 was not modified. This may have rendered the
sensors plugin unusable for some people.
Sebastian Harl [Wed, 16 Apr 2008 16:53:30 +0000 (18:53 +0200)]
configure: Build perl bindings only if a perl interpreter is available.
For this purpose a check for the perl interpreter has been added. As the
check for libperl requires a perl interpreter as well (to get the compiler
and linker flags) the perl module will be disabled as well if a perl
interpreter is not available.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@verplant.org>
Florian Forster [Tue, 15 Apr 2008 14:57:46 +0000 (16:57 +0200)]
collectd.conf(5): Document the `DataSource' option.
Florian Forster [Tue, 15 Apr 2008 14:23:03 +0000 (16:23 +0200)]
src/utils_threshold.c: Fix a simple typo.
Florian Forster [Tue, 15 Apr 2008 12:04:55 +0000 (14:04 +0200)]
Merge branch 'collectd-4.3'
Florian Forster [Tue, 15 Apr 2008 12:04:47 +0000 (14:04 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Mon, 14 Apr 2008 15:45:50 +0000 (17:45 +0200)]
src/utils_threshold.c: Check all matching thresholds and respect the data source setting.
This commit breaks up the original `ut_check_threshold' function into some
smaller functions which is much easier to read. Also adds some (hopefully)
informative comments that explain what the functions do.
The changes compile but have not yet been tested! Also, the
collectd.conf(5) manpage needs to be updated.
References: #11
Florian Forster [Mon, 14 Apr 2008 11:39:06 +0000 (13:39 +0200)]
src/utils_threshold.c: Implement configuration of multiple data sources per type.
This is the first part that implements the configuration of multiple data
sources. The part that implements matching will be added later.
Florian Forster [Mon, 14 Apr 2008 10:26:08 +0000 (12:26 +0200)]
build system: Check if strtok_r needs _REENTRANT
Resolves: #8
Florian Forster [Sun, 13 Apr 2008 09:57:50 +0000 (11:57 +0200)]
Merge branch 'sh/teamspeak2'
Florian Forster [Sun, 13 Apr 2008 09:57:02 +0000 (11:57 +0200)]
teamspeak2 plugin: Call `tss2_vserver_gapl' from `tss2_read_vserver'.
This way the file descriptors can be reused and we can assure that the vserver
has been selected.
Stefan Hacker [Sun, 13 Apr 2008 09:27:34 +0000 (11:27 +0200)]
teamspeak2 plugin: Add collection of packet loss.
I added another interesting gauge to the sets of values which get fetched. The
average package loss in percent. I used the percent type from types.db...not
really intuitive when looking at the folders but it works. I also tried to add
something to the manpage...but I wasn't able to test it because the manpages
just don't install with make install...
Florian Forster [Sun, 13 Apr 2008 09:12:22 +0000 (11:12 +0200)]
Merge branch 'collectd-4.2' of octo@verplant.org:/var/lib/git/collectd into collectd-4.2
Florian Forster [Sun, 13 Apr 2008 09:06:14 +0000 (11:06 +0200)]
Merge branch 'sh/teamspeak2'
Florian Forster [Sun, 13 Apr 2008 09:05:57 +0000 (11:05 +0200)]
AUTHORS: Added Stefan Hacker.
Florian Forster [Sun, 13 Apr 2008 09:02:47 +0000 (11:02 +0200)]
teamspeak2 plugin: Inform about unknown fields.
Known but uninteresting fields are ignored.
Florian Forster [Sun, 13 Apr 2008 08:37:45 +0000 (10:37 +0200)]
collectd.conf(5): teamspeak2/Port needs to be a string.
Also corrected a typo in src/collectd.conf.in.
Stefan Hacker [Sun, 13 Apr 2008 08:20:08 +0000 (10:20 +0200)]
teamspeak2 plugin: Added comments.
I added a few more comments so I could understand it better ;-)
Stefan Hacker [Sun, 13 Apr 2008 08:13:44 +0000 (10:13 +0200)]
teamspeak2 plugin: Flush the sending filehandle after writing to it.
The only real Problem I found is that you forgot to flush the outgoing buffer
after using fputs so nothing got sent. I added the fflush but now I'm not
really sure what would happen if sending failed....
Stefan Hacker [Sun, 13 Apr 2008 08:11:57 +0000 (10:11 +0200)]
collectd.conf(5): Added documentation for the TeamSpeak2 plugin.
Florian Forster [Thu, 10 Apr 2008 12:04:39 +0000 (14:04 +0200)]
teamspeak2 plugin: Introduce and use the `io_octets' and `io_packets' types.
Florian Forster [Thu, 10 Apr 2008 11:58:35 +0000 (13:58 +0200)]
teamspeak2 plugin: Code cleanup.
The changes include:
- Use the ``tss2_'' prefix for all functions.
- Manage the global connection in two central functions rather than distribute
connection handling all over the place.
- Handle ``global'' and ``per server'' statistics in one function.
- Using `getaddrinfo' rather than `inet_addr' to allow for IPv6 connections.
- Some formatting.
Sebastian Harl [Tue, 8 Apr 2008 11:03:20 +0000 (13:03 +0200)]
apache, nginx plugins: Added "Verify{Peer,Host}" configuration options.
"VerifyPeer" may be used to disable peer SSL certificate verification and
"VerifyHost" may be used to disable peer host name (as provided by the SSL
certificate's CA or SAN fields) verification.
Using both options is similar to curl's "--insecure" command line
option.
As requested by Joerg Jaspert.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 9 Apr 2008 16:45:38 +0000 (18:45 +0200)]
Merge branch 'collectd-4.3'
Conflicts:
src/exec.c
Florian Forster [Wed, 9 Apr 2008 16:34:48 +0000 (18:34 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3
Conflicts:
src/exec.c
Florian Forster [Wed, 9 Apr 2008 16:32:14 +0000 (18:32 +0200)]
exec plugin: Close all file descriptors but the one connected to the pipe.
Florian Forster [Wed, 9 Apr 2008 16:15:01 +0000 (18:15 +0200)]
powerdns plugin: Don't include <malloc.h>.
It isn't necessary and doesn't exist on some systems.
Florian Forster [Wed, 9 Apr 2008 10:10:49 +0000 (12:10 +0200)]
teamspeak2 plugin: Renamed some types and variables.
And beautyfied the error and debug messages.
Florian Forster [Wed, 9 Apr 2008 09:24:01 +0000 (11:24 +0200)]
teamspeak2 plugin: Renamed the `tss2' plugin to `teamspeak2' and fixed warnings.
Stefan Hacker [Wed, 9 Apr 2008 09:08:09 +0000 (11:08 +0200)]
tss2 plugin: Add a plugin to query statistics from a TeamSpeak2 server.
Florian Forster [Wed, 9 Apr 2008 09:01:12 +0000 (11:01 +0200)]
Merge branch 'ff/ascent'
Florian Forster [Wed, 9 Apr 2008 09:00:54 +0000 (11:00 +0200)]
collectd.conf(5): Documented the `ascent' plugin.
Also updated the `README' file and the sample configuration.
Florian Forster [Wed, 9 Apr 2008 08:44:58 +0000 (10:44 +0200)]
ascent plugin: Store latency in seconds, not milli seconds.
Florian Forster [Tue, 8 Apr 2008 13:00:01 +0000 (15:00 +0200)]
ascent plugin: Fix classes/races and ignore unhandled tags.
Classes and races were exchanged, this was fixed.
Sebastian Harl [Fri, 4 Apr 2008 20:05:48 +0000 (22:05 +0200)]
migrate-3-4.px: Use 'rrdtool tune' instead of 'sed' to rename DS's.
Either the output format of 'rrdtool dump' has changed or there was an
error in the regex used with sed in the first place. Anyway, in some cases
the 'if_octects' DS's did not get translated. 'rrdtool tune' should be
able to handle it correctly in any case.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 8 Apr 2008 07:49:23 +0000 (09:49 +0200)]
exec plugin: Removed whitespaces at EOL.
Peter Holik [Tue, 1 Apr 2008 14:12:10 +0000 (16:12 +0200)]
exec plugin: Separate stdout and stderr.
Hi!
Digitemp sends errors to stderr, but collectd handles stdout and stderr
as the same and reports parsing errors.
My idea is to seperate stdout and stderr.
I also removed the special pipe handling checking for stdin...
because exec plugin will alway have a fd > 2 for pipes !!
(fd 0,1 and 2 (stdin, stdout, stderr) are used by collectd with /dev/null if demonized)
now strings from stderr will be reportet by ERROR
cu Peter
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 8 Apr 2008 07:42:48 +0000 (09:42 +0200)]
ascent plugin: Added handling of `sessions'.
I. e. per-player information.
Florian Forster [Mon, 7 Apr 2008 10:02:18 +0000 (12:02 +0200)]
ascent plugin: New plugin to collect AscentEmu server statistics.
Florian Forster [Fri, 4 Apr 2008 12:25:33 +0000 (14:25 +0200)]
ipmi plugin: Add ignorelist functionality.
Florian Forster [Fri, 4 Apr 2008 09:02:38 +0000 (11:02 +0200)]
ipmi plugin: Improve error messages when removing a sensor.
Don't tell the user to file a bug report, when a sensor is removed because IPMI
reported an error. Tell him to file a bug report, though, if collectd doesn't
know how to handle the value.
Florian Forster [Fri, 4 Apr 2008 08:54:40 +0000 (10:54 +0200)]
ipmi plugin: Add a stupi bug which prevented basically all sensors from being collected.
Florian Forster [Fri, 4 Apr 2008 08:54:15 +0000 (10:54 +0200)]
src/collectd.conf.in: Added a `LoadPlugin' line for the ipmi plugin.
Florian Forster [Fri, 4 Apr 2008 08:53:47 +0000 (10:53 +0200)]
configure.in: Add the OpenIPMI library to the status output.
Florian Forster [Thu, 3 Apr 2008 08:11:57 +0000 (10:11 +0200)]
COPYING: Switched to a version with the new address of the FSF.
Florian Forster [Thu, 3 Apr 2008 07:39:03 +0000 (09:39 +0200)]
Merge branch 'collectd-4.3'
Florian Forster [Thu, 3 Apr 2008 07:38:56 +0000 (09:38 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Thu, 3 Apr 2008 07:35:28 +0000 (09:35 +0200)]
COPYING: Added the file (including the GPLv2).
Newer versions of automake copy the GPLv3 when invoked with ``--add-missing''
which is not what we want.
Florian Forster [Wed, 2 Apr 2008 15:49:44 +0000 (17:49 +0200)]
ipmi plugin: Add a plugin to read sensor values via IPMI.
The plugin is very basic and still basically alpha quality. You cannot
configure anything yet, neither where to connect to (the local, SMI connection
is used right now) nor what sensors to collect (collects all it can make sense
of). I hope to be able to do that on friday or some other workday in the near
future.
Florian Forster [Tue, 1 Apr 2008 13:06:56 +0000 (15:06 +0200)]
Merge branch 'collectd-4.3'
Florian Forster [Tue, 1 Apr 2008 13:05:45 +0000 (15:05 +0200)]
Merge branch 'collectd-4.2' into collectd-4.3
Conflicts:
configure.in
src/plugin.c
Sebastian Harl [Mon, 31 Mar 2008 09:31:38 +0000 (11:31 +0200)]
unixsock plugin: Do not unregister a write-callback in us_shutdown().
The unixsock plugin no longer registers a write-callback. Basically,
unregistering a non-existent callback does not do any harm, However, if no
write-callback has been registered at all, the appropriate linked list has
never been created and the process will segfault when trying to access it.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 1 Apr 2008 12:11:35 +0000 (14:11 +0200)]
configure.in: Set CPPFLAGS when checking headers.
When checking for <upsclient.h> (and the headers of a few other libraries) the
library specific CFLAGS were added to the global CFLAGS variable. This variable
is used when checking for ``header usability'', but not when checking for
``header presence'' for some reason.
This commit uses the global CPPFLAGS variable instead, which is used in both
checks. Libraries that benefit from this commit are:
- libcurl,
- libmysql(client),
- libnetsnmp,
- libupsclient.
Resolves #6
Florian Forster [Tue, 1 Apr 2008 08:40:39 +0000 (10:40 +0200)]
apache plugin: Increase the size of the read-buffer dynamically.
Why guess the size if you can just adapt to whatever comes in? The memory isn't
freed ever, though.
Florian Forster [Mon, 31 Mar 2008 15:03:56 +0000 (17:03 +0200)]
src/plugin.c: plugin_dispatch_values: Improve the error messages.
If no write plugin was loaded or no DS was defined, the
`plugin_dispatch_values' used to fail silently. This is of course not good, so
this commit introduces error messages for this case, so that users can see why
their setup is not working properly.
Also, the ``no such DS type'' message was promoted from DEBUG to INFO.
Florian Forster [Mon, 31 Mar 2008 13:51:13 +0000 (15:51 +0200)]
src/common.c: Make really sure BYTE_ORDER and BIG_ENDIAN are defined.
If both, BYTE_ORDER and BIG_ENDIAN, are undefined, the statement
#if BYTE_ORDER == BIG_ENDIAN
will be evaluated to `true', which may cause `ntohll' and `htonll' to behave
weird.
Florian Forster [Mon, 31 Mar 2008 13:00:35 +0000 (15:00 +0200)]
src/utils_tail.c: Call `stat' after reading till the end of file.
The old code used stat(2) to determine if the file was moved and reopened the
file before reading anything. This way lines, that were added to the file
before it was moved, would have been missed. This commit changes that behavior
so that the file is read until EOF and _then_ stat(2) is used to check if the
file has been moved away.
Sebastian Harl [Mon, 31 Mar 2008 08:46:42 +0000 (10:46 +0200)]
plugin.c: Tell the user if a plugin could not be found.
Up to now this error was silently ignored, letting the user believe that
everything went fine.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 30 Mar 2008 18:00:45 +0000 (20:00 +0200)]
collection.cgi: Make sure to pass valid variable names to rrdgraph.
Variable names used with DEF, VDEF, etc. must be made up of the
characters "A-Z, a-z, 0-9, -, _". In meta_graph_generic_stack() variable
names have been generated from the instance name which may, however,
contain illegal characters. Now, all illegal characters will be replaced
with "_" and a number will be prepended to the variable name to make
sure the name is still unique.
Thanks to Joerg Jaspert for pointing this out and helpful debugging
information.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 31 Mar 2008 06:29:25 +0000 (08:29 +0200)]
hddtemp plugin: Prefix all messages with "hddtemp plugin:".
Sebastian Harl [Sun, 30 Mar 2008 15:25:16 +0000 (17:25 +0200)]
collection.cgi: Added "meta graph" for "dns_qtype" and "dns_rcode".
This will merge all query types and return codes into a single graph each.
get_n_colors() has been taken from the version 3 script to get the colors for
the graphs. get_random_color() imho is not suitable for that purpose as it can
return colors that are hardly different - which would result in graphs that
are hard to read. get_n_colors() now returns a hash-ref suitable to be passed
to meta_graph_generic_stack().
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 30 Mar 2008 17:35:14 +0000 (19:35 +0200)]
collection.cgi: Added support for "wireless" values.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Thorsten von Eicken [Sun, 30 Mar 2008 17:16:20 +0000 (19:16 +0200)]
rrdtool plugin: Reduce the filesize of files created per default.
When creating an RRD file, the rrdtool plugin doesn't do what it's supposed to
do. Instead of creating 5 RRAs it creates 4 and in doing so it skips the first
one. The result is about 2x the number of datapoints total. The fix below works
for me. It's for 4.2.2 but it looks like this hasn't changed in the latest 4.3
beta.
Resolves: #5
Sebastian Harl [Sun, 30 Mar 2008 13:45:04 +0000 (15:45 +0200)]
collection.cgi: Updated "dns" types to version 4.x.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Sun, 30 Mar 2008 11:00:58 +0000 (13:00 +0200)]
powerdns plugin: Fixes for the connection handling.
The connection stuff has been fixed to actually work with the daemon. The data
received is not yet handled completely. I'm waiting for feedback from Luke on
that..
References #1
Florian Forster [Sun, 24 Feb 2008 21:20:34 +0000 (22:20 +0100)]
powerdns plugin: Code cleanups.
Luke Heberling [Sun, 24 Feb 2008 16:44:12 +0000 (17:44 +0100)]
powerdns plugin: Added a plugin to read statistics from PowerDNS' control socket.
Florian Forster [Sat, 29 Mar 2008 10:07:13 +0000 (11:07 +0100)]
Bumped version to 4.3.2; Updated ChangeLog.
Florian Forster [Sat, 29 Mar 2008 09:52:45 +0000 (10:52 +0100)]
Merge branch 'collectd-4.2' into collectd-4.3
Conflicts:
ChangeLog
version-gen.sh
Florian Forster [Sat, 29 Mar 2008 09:34:46 +0000 (10:34 +0100)]
Bumped version to 4.2.6
Florian Forster [Sat, 29 Mar 2008 08:59:17 +0000 (09:59 +0100)]
disk plugin: Implement an ignorelist.
Not all disks collected by the disk plugin may be of interest. This commit
implements an ignorelist as provided by src/utils_ignorelist.c to make it
possible to select exactly which instances are interesting and which are not.
Resolves: #3
Florian Forster [Sat, 29 Mar 2008 08:57:13 +0000 (09:57 +0100)]
src/utils_ignorelist.c: ignorelist_match: Allow the `ignorelist' to be NULL.
This makes calling the function easier, because initialization of the
ignorelist in the plugin usually depends on configuration parameters..
Florian Forster [Thu, 27 Mar 2008 16:52:53 +0000 (17:52 +0100)]
ChangeLog: Added changes since 4.2.5.
Florian Forster [Thu, 27 Mar 2008 16:41:08 +0000 (17:41 +0100)]
collectd.conf(5): Document vmem's configuration option.
Also updates src/collectd.conf.in.
Florian Forster [Thu, 27 Mar 2008 16:13:41 +0000 (17:13 +0100)]
vmem plugin: Add the `Verbose' config option.
All the statistics is just too much for every-day-use ;)
Florian Forster [Thu, 27 Mar 2008 14:42:40 +0000 (15:42 +0100)]
vmem plugin: Added a plugin to collect virtual memory statistics.
Peter Holik [Wed, 26 Mar 2008 12:48:09 +0000 (13:48 +0100)]
sensors plugin: Simple fix for temperature sensors.
Hi everybody!
While playing with sensors i missed temperature rrd files:
--- sensors.c.orig 2008-03-25 14:58:21.
000000000 +0100
+++ sensors.c 2008-03-25 14:58:27.
000000000 +0100
@@ -580,7 +580,7 @@
type = "fanspeed";
else if (fl->feature->type
== SENSORS_FEATURE_TEMP)
- type = "input";
+ type = "temperature";
else
continue;
because this type got registered as input and "input" is not in types.db
after configuring with --enable-debug i saw a log:
No such dataset registered: input
should that be also without --enable-debug in my syslog?
cu Peter
Florian Forster [Wed, 26 Mar 2008 08:56:48 +0000 (09:56 +0100)]
Merge branch 'collectd-4.3'
Florian Forster [Wed, 26 Mar 2008 08:56:41 +0000 (09:56 +0100)]
Merge branch 'pull/master'
Florian Forster [Wed, 26 Mar 2008 08:56:22 +0000 (09:56 +0100)]
Merge branch 'pull/collectd-4.3' into collectd-4.3
Florian Forster [Wed, 26 Mar 2008 08:52:25 +0000 (09:52 +0100)]
Merge branch 'collectd-4.3'
Conflicts:
src/unixsock.c
Florian Forster [Wed, 26 Mar 2008 08:48:27 +0000 (09:48 +0100)]
Merge branch 'collectd-4.2' into collectd-4.3
Conflicts:
src/unixsock.c