Code

collectd.git
18 years agodns plugin: Collect and transfer byte counters for queries and replies.
Florian Forster [Wed, 25 Oct 2006 14:18:29 +0000 (16:18 +0200)]
dns plugin: Collect and transfer byte counters for queries and replies.

18 years agoRenamed more variables and functions and such from `named' -> `dns'
Florian Forster [Wed, 25 Oct 2006 13:45:55 +0000 (15:45 +0200)]
Renamed more variables and functions and such from `named' -> `dns'

18 years agoRenamed the `named'-plugin to `dns'-plugin.
Florian Forster [Wed, 25 Oct 2006 13:43:10 +0000 (15:43 +0200)]
Renamed the `named'-plugin to `dns'-plugin.

18 years agocollection.cgi: Added `rcode'
Florian Forster [Sun, 22 Oct 2006 14:10:53 +0000 (16:10 +0200)]
collection.cgi: Added `rcode'

18 years agoMore improvements on the named/dns plugin.
Florian Forster [Sun, 22 Oct 2006 14:08:45 +0000 (16:08 +0200)]
More improvements on the named/dns plugin.

The `dnstop.c' code now contains my IPv6 patch to capture IPv6 traffic. The
plugin captures both, queries and replies, and collects statistics
accordingly. This means that the qtype of queries and the rcode of replies are
collected. The plugin can now be configured to ignore certain sources, but
this functionality is to be improved.

18 years agocollection.cgi: Added `qtype'
Florian Forster [Sat, 21 Oct 2006 12:38:01 +0000 (14:38 +0200)]
collection.cgi: Added `qtype'

18 years agonamed plugin: Many many more fixes to get the plugin working.
Florian Forster [Fri, 20 Oct 2006 09:41:35 +0000 (11:41 +0200)]
named plugin: Many many more fixes to get the plugin working.

So far the QTypes are collected, and nothing else. But the core pcap-capturing
and communication over the pipe work now.

18 years agosrc/named.c: Fixed typos and stuff that prevented the compiler to build the file...
Florian Forster [Tue, 3 Oct 2006 16:39:10 +0000 (18:39 +0200)]
src/named.c: Fixed typos and stuff that prevented the compiler to build the file correctly.

18 years agoMoved the definition of `T_MAX'.
Florian Forster [Tue, 3 Oct 2006 16:37:43 +0000 (18:37 +0200)]
Moved the definition of `T_MAX'.

18 years agoUpdated the build scripts for the named plugin.
Florian Forster [Tue, 3 Oct 2006 16:36:07 +0000 (18:36 +0200)]
Updated the build scripts for the named plugin.

18 years agoAdded the named plugin and a check for libpcap to the configure script.
Florian Forster [Tue, 3 Oct 2006 15:16:44 +0000 (17:16 +0200)]
Added the named plugin and a check for libpcap to the configure script.

18 years agoAdded a first rough draft of the new named plugin.
Florian Forster [Tue, 3 Oct 2006 15:06:47 +0000 (17:06 +0200)]
Added a first rough draft of the new named plugin.

18 years agosrc/apache.c: Increase the buffer size from 4kByte to 16kByte, since this was a probl...
Florian Forster [Tue, 26 Sep 2006 18:05:21 +0000 (20:05 +0200)]
src/apache.c: Increase the buffer size from 4kByte to 16kByte, since this was a problem twice.

Also, make this limit easier to configure.

18 years agoThis patch adds an new plugin called multimeter.
Peter Holik [Fri, 4 Aug 2006 18:37:13 +0000 (20:37 +0200)]
This patch adds an new plugin called multimeter.

I have a multimeter which can be connected to the serial port. It is
called Metex M4650CR.

No configuration is nesessary, this multimeter is autodetected on
programm start if connected and switched on. Only your serial port has
to be enabled (setserial /dev/ttyS0 autoconfig)

18 years agoMerge branch 'origin'
Florian Forster [Sat, 22 Jul 2006 20:38:29 +0000 (22:38 +0200)]
Merge branch 'origin'

18 years agoMerge branch 'collectd-3.10'
Florian Forster [Sat, 22 Jul 2006 20:36:46 +0000 (22:36 +0200)]
Merge branch 'collectd-3.10'

18 years agoMerge branch 'collectd-3.10' of octo@verplant.org:/var/lib/git/collectd into collectd...
Florian Forster [Sat, 22 Jul 2006 20:34:27 +0000 (22:34 +0200)]
Merge branch 'collectd-3.10' of octo@verplant.org:/var/lib/git/collectd into collectd-3.10

18 years agocollectd.conf.pod: Fix the synopsis: There is not `Port' option.
Florian Forster [Sat, 22 Jul 2006 20:33:43 +0000 (22:33 +0200)]
collectd.conf.pod: Fix the synopsis: There is not `Port' option.

[22:23] <@tokkee> octo: Also laut deiner Manpage ist Listen ein Alias fuer Server und es gibt auch ne Option "Port" ;-)

18 years agocollectd.conf.in: Added (commented) lines for the `Listen' and `Server' options.
Florian Forster [Sat, 22 Jul 2006 20:28:40 +0000 (22:28 +0200)]
collectd.conf.in: Added (commented) lines for the `Listen' and `Server' options.

[22:20] <@tokkee> octo: Koenntest du bitte im naechsten Release von collectd in das Config-File auskommentierte Bsp-Zeilen fuer "Server" und "Port" mit rein nehmen?
[22:20] <@octo> tokkee: Ja, kann ich machen..
[22:21] <@tokkee> octo: Thx.
[22:21] <@tokkee> octo: Dann brauch ich wegen so was net mit patchen im Paket anfangen ;-)

18 years agoMerge branch 'master' of /var/lib/git/collectd
Florian Forster [Wed, 19 Jul 2006 16:52:20 +0000 (18:52 +0200)]
Merge branch 'master' of /var/lib/git/collectd

18 years agoMerge branch 'collectd-3.10'
Florian Forster [Wed, 19 Jul 2006 16:51:35 +0000 (18:51 +0200)]
Merge branch 'collectd-3.10'

18 years agoBumped version to 3.10.1; Updated ChangeLog. collectd-3.10.1
Florian Forster [Wed, 19 Jul 2006 16:50:21 +0000 (18:50 +0200)]
Bumped version to 3.10.1; Updated ChangeLog.

18 years agoapcups plugin: Close the socket when `connect' failes.
Florian Forster [Wed, 19 Jul 2006 16:41:36 +0000 (18:41 +0200)]
apcups plugin: Close the socket when `connect' failes.

Otherwise people will get `Too many open files' faily soon.

18 years agoUpgraded liboping to version 0.2.3
Florian Forster [Sun, 16 Jul 2006 14:17:50 +0000 (16:17 +0200)]
Upgraded liboping to version 0.2.3

18 years agoMerge branch 'master' of /var/lib/git/collectd
Florian Forster [Sun, 16 Jul 2006 13:35:22 +0000 (15:35 +0200)]
Merge branch 'master' of /var/lib/git/collectd

18 years agoMerge branch 'ff/processes'
Florian Forster [Sat, 15 Jul 2006 08:14:39 +0000 (10:14 +0200)]
Merge branch 'ff/processes'

18 years agoMerge branch 'processes' of /var/lib/git/collectd
Florian Forster [Tue, 11 Jul 2006 12:07:41 +0000 (14:07 +0200)]
Merge branch 'processes' of /var/lib/git/collectd

18 years agocollection.cgi: The new processes RRD files have been added.
Florian Forster [Mon, 10 Jul 2006 21:10:19 +0000 (23:10 +0200)]
collection.cgi: The new processes RRD files have been added.

The new files are:
* ps_rss
* ps_cputime
* ps_count
* ps_pagefaults

18 years agoprocesses plugin: The DS-type of the pagefault RRD-file is COUNTER, not GAUGE.
Florian Forster [Mon, 10 Jul 2006 21:03:52 +0000 (23:03 +0200)]
processes plugin: The DS-type of the pagefault RRD-file is COUNTER, not GAUGE.

18 years agocollection.cgi: Improved the interfaces package and error count.
Florian Forster [Mon, 10 Jul 2006 20:32:28 +0000 (22:32 +0200)]
collection.cgi: Improved the interfaces package and error count.

18 years agovserver plugin: Use `plugin_complain' and `plugin_relief'.
Florian Forster [Mon, 10 Jul 2006 18:56:27 +0000 (20:56 +0200)]
vserver plugin: Use `plugin_complain' and `plugin_relief'.

18 years agoprocesses plugin: Renamed the selection option to `Process'.
Florian Forster [Mon, 10 Jul 2006 18:51:57 +0000 (20:51 +0200)]
processes plugin: Renamed the selection option to `Process'.

18 years agoprocesses plugin: Improved the storage of counters, so they work when the number...
Florian Forster [Mon, 10 Jul 2006 15:21:22 +0000 (17:21 +0200)]
processes plugin: Improved the storage of counters, so they work when the number of running instances varies.

18 years agoprocesses plugin: Implement collecting the number of pagefaults for a selected process.
Florian Forster [Mon, 10 Jul 2006 12:34:45 +0000 (14:34 +0200)]
processes plugin: Implement collecting the number of pagefaults for a selected process.

18 years agocpu plugin: Use `plugin_complain' and `plugin_relief'.
Florian Forster [Mon, 10 Jul 2006 11:43:28 +0000 (13:43 +0200)]
cpu plugin: Use `plugin_complain' and `plugin_relief'.

18 years agodisk plugin: Use `plugin_complain' and `plugin_relief'.
Florian Forster [Mon, 10 Jul 2006 11:33:55 +0000 (13:33 +0200)]
disk plugin: Use `plugin_complain' and `plugin_relief'.

18 years agoapcups plugin: Use `plugin_complain' and `plugin_relief'.
Florian Forster [Mon, 10 Jul 2006 10:10:23 +0000 (12:10 +0200)]
apcups plugin: Use `plugin_complain' and `plugin_relief'.

18 years agoImplemented `plugin_complain' and `plugin_relief' for better error-logging in plugins.
Florian Forster [Mon, 10 Jul 2006 09:42:10 +0000 (11:42 +0200)]
Implemented `plugin_complain' and `plugin_relief' for better error-logging in plugins.

18 years agoprocesses plugin: Implement number of processes and number of threads/LWPs of a speci...
Florian Forster [Mon, 10 Jul 2006 08:13:48 +0000 (10:13 +0200)]
processes plugin: Implement number of processes and number of threads/LWPs of a specific name.

18 years agoMerge branch 'master' into ff/processes
Florian Forster [Mon, 10 Jul 2006 07:53:38 +0000 (09:53 +0200)]
Merge branch 'master' into ff/processes

18 years agodebian/: Corrected the files needed for building Debian packages. collectd-3.10.0
Florian Forster [Sun, 9 Jul 2006 12:46:27 +0000 (14:46 +0200)]
debian/: Corrected the files needed for building Debian packages.

18 years agoBumped version to 3.10.0.
Florian Forster [Sun, 9 Jul 2006 10:54:26 +0000 (12:54 +0200)]
Bumped version to 3.10.0.

18 years agocollectd.spec: Added the `ntpd' plugin.
Florian Forster [Sun, 9 Jul 2006 10:51:13 +0000 (12:51 +0200)]
collectd.spec: Added the `ntpd' plugin.

18 years agoDon't include the debian/ subdirectory in the distribution tarball, since Sebastian...
Florian Forster [Sun, 9 Jul 2006 10:46:37 +0000 (12:46 +0200)]
Don't include the debian/ subdirectory in the distribution tarball, since Sebastian has packaged an official package.

Apparently Debian developers prefer not having this directory in the tarball..

18 years agoMerge branch 'ff/traffic'
Florian Forster [Sun, 9 Jul 2006 10:38:44 +0000 (12:38 +0200)]
Merge branch 'ff/traffic'

18 years agocollection.cgi: Add the new network RRD-files `if_errors.rrd' and `if_packets.rrd'.
Florian Forster [Sun, 9 Jul 2006 10:34:55 +0000 (12:34 +0200)]
collection.cgi: Add the new network RRD-files `if_errors.rrd' and `if_packets.rrd'.

18 years agoping plugin: Updated the ping plugin to work with liboping 0.2.2.
Florian Forster [Sun, 9 Jul 2006 10:16:02 +0000 (12:16 +0200)]
ping plugin: Updated the ping plugin to work with liboping 0.2.2.

18 years agoliboping: Use `oping.h' rather than the (old) `liboping.h'.
Florian Forster [Sun, 9 Jul 2006 10:07:48 +0000 (12:07 +0200)]
liboping: Use `oping.h' rather than the (old) `liboping.h'.

18 years agoliboping: Updated `oping.h' to version 0.2.2. This has been forgotten previously.
Florian Forster [Sun, 9 Jul 2006 10:06:06 +0000 (12:06 +0200)]
liboping: Updated `oping.h' to version 0.2.2. This has been forgotten previously.

18 years agorenamed: src/liboping/liboping.h -> src/liboping/oping.h
Florian Forster [Sun, 9 Jul 2006 10:05:33 +0000 (12:05 +0200)]
renamed: src/liboping/liboping.h -> src/liboping/oping.h

18 years agoMerge branch 'install-config'
Florian Forster [Sun, 9 Jul 2006 09:43:04 +0000 (11:43 +0200)]
Merge branch 'install-config'

18 years agocollectd.conf: Un-comment a valid mode using the automake mechanismn.
Florian Forster [Sun, 9 Jul 2006 09:38:51 +0000 (11:38 +0200)]
collectd.conf: Un-comment a valid mode using the automake mechanismn.

18 years agoDon't overwrite an existing config file. Use `collectd.conf.pkg-orig' instead.
Florian Forster [Sun, 9 Jul 2006 09:21:31 +0000 (11:21 +0200)]
Don't overwrite an existing config file. Use `collectd.conf.pkg-orig' instead.

18 years agotraffic plugin: Store the new `if_packets.rrd' and `if_errors.rrd' in a seperate...
Florian Forster [Sun, 9 Jul 2006 08:49:15 +0000 (10:49 +0200)]
traffic plugin: Store the new `if_packets.rrd' and `if_errors.rrd' in a seperate subdirectory.

This makes it easier for user interfaces to know what host, and what a plugin
subdirectory is.

18 years agoMerge branch 'collectd-3.9'
Florian Forster [Sun, 9 Jul 2006 08:16:49 +0000 (10:16 +0200)]
Merge branch 'collectd-3.9'

18 years agonetwork: Be more verbose when `network_create_socket' failes due to a wrong `mode'.
Florian Forster [Sun, 9 Jul 2006 08:16:15 +0000 (10:16 +0200)]
network: Be more verbose when `network_create_socket' failes due to a wrong `mode'.

On Sat, Jul 08, 2006 at 02:14:05PM +0000, Cryptronic wrote:
>  collectd[6889]: network_create_socket (zensoredip, 25826) failed

if this is the only error you get, you most likely need to put
  Mode Client
Somewhere before the `Listen' statement.

18 years agocollectd.conf: (Un)comment plugins based on the configure-setting. Install the file...
Florian Forster [Sun, 9 Jul 2006 00:30:51 +0000 (02:30 +0200)]
collectd.conf: (Un)comment plugins based on the configure-setting. Install the file in `sysconfdir'.

What's not done yet is checking wether or not the (destination) file already
exists and _don't_ overwrite it.

18 years agorenamed: contrib/collectd.conf -> src/collectd.conf.in
Florian Forster [Sat, 8 Jul 2006 23:53:27 +0000 (01:53 +0200)]
renamed: contrib/collectd.conf -> src/collectd.conf.in

18 years agoMerge branch 'master' into processes
Florian Forster [Sat, 8 Jul 2006 17:29:42 +0000 (19:29 +0200)]
Merge branch 'master' into processes

18 years agoliboping: Updated liboping to version 0.2.2
Florian Forster [Sat, 8 Jul 2006 17:24:22 +0000 (19:24 +0200)]
liboping: Updated liboping to version 0.2.2

18 years agoMerge branch 'v39/liboping-license'
Florian Forster [Sat, 8 Jul 2006 17:03:37 +0000 (19:03 +0200)]
Merge branch 'v39/liboping-license'

18 years agoliboping: Include information about the package in the source districution.
Florian Forster [Sat, 8 Jul 2006 17:03:03 +0000 (19:03 +0200)]
liboping: Include information about the package in the source districution.

The included files are: AUTHORS, COPYING, ChangeLog, and README

18 years agotraffic plugin: Documented the new optioins in collectd.conf(5).
Florian Forster [Sat, 8 Jul 2006 16:53:25 +0000 (18:53 +0200)]
traffic plugin: Documented the new optioins in collectd.conf(5).

18 years agotraffic plugin: Made it possible to select/ignore certain interfaces.
Florian Forster [Sat, 8 Jul 2006 16:37:15 +0000 (18:37 +0200)]
traffic plugin: Made it possible to select/ignore certain interfaces.

Based on an idea by and a discussion with Zhuang Yuyao.

18 years agoliboping: Added license and other information.
Florian Forster [Fri, 7 Jul 2006 09:44:34 +0000 (11:44 +0200)]
liboping: Added license and other information.

octo@alice:~/collectd $ git add src/liboping/{AUTHORS,COPYING,ChangeLog,README}

18 years agoMerge branch 'v39/libconfig-license'
Florian Forster [Fri, 7 Jul 2006 08:40:59 +0000 (10:40 +0200)]
Merge branch 'v39/libconfig-license'

18 years agolibconfig: Include the license information in the distribution tarball.
Florian Forster [Fri, 7 Jul 2006 08:40:28 +0000 (10:40 +0200)]
libconfig: Include the license information in the distribution tarball.

Also added README and other information.

18 years agoMerge branch 'collectd-3.9'
Florian Forster [Sun, 25 Jun 2006 17:42:08 +0000 (19:42 +0200)]
Merge branch 'collectd-3.9'

18 years agoconfigure.in: Bumped verion to 3.9.4. collectd-3.9.4
Florian Forster [Sun, 25 Jun 2006 17:34:15 +0000 (19:34 +0200)]
configure.in: Bumped verion to 3.9.4.

18 years agoCorrected the date of the 3.9.4 version in `ChangeLog', `debian/changelog' and `colle...
Florian Forster [Sun, 25 Jun 2006 17:33:51 +0000 (19:33 +0200)]
Corrected the date of the 3.9.4 version in `ChangeLog', `debian/changelog' and `collectd.spec'.

18 years agoconfigfile: Be more verbose if the `Server' or `Local' modes are not available.
Florian Forster [Sun, 25 Jun 2006 13:45:21 +0000 (15:45 +0200)]
configfile: Be more verbose if the `Server' or `Local' modes are not available.

This happends if not linking against librrd. Some people missed the summary at
the end of the configure script and the error message wasn't helping them.

18 years agoMerge branch 'collectd-3.9'
Florian Forster [Sun, 25 Jun 2006 10:13:07 +0000 (12:13 +0200)]
Merge branch 'collectd-3.9'

18 years agocollectd-3.9: Removed `src/libping' since it's not used.
Florian Forster [Sun, 25 Jun 2006 10:09:15 +0000 (12:09 +0200)]
collectd-3.9: Removed `src/libping' since it's not used.

18 years agoMerge branch 'svn-trunk'
Florian Forster [Sun, 25 Jun 2006 09:25:52 +0000 (11:25 +0200)]
Merge branch 'svn-trunk'

18 years agoCopied missing files from the subversion repository. svn-trunk
Florian Forster [Sun, 25 Jun 2006 09:22:59 +0000 (11:22 +0200)]
Copied missing files from the subversion repository.

18 years agoChangeLog: Added the bugfix with `operating_mode'.
Florian Forster [Sun, 25 Jun 2006 09:15:35 +0000 (11:15 +0200)]
ChangeLog: Added the bugfix with `operating_mode'.

18 years agoMerge branch 'v393-fix' into b39-fix
Florian Forster [Sun, 25 Jun 2006 08:56:59 +0000 (10:56 +0200)]
Merge branch 'v393-fix' into b39-fix

18 years agoApplied all the changes that `git-svnimport' missed. collectd-3.9.3
Florian Forster [Sun, 25 Jun 2006 08:53:36 +0000 (10:53 +0200)]
Applied all the changes that `git-svnimport' missed.

18 years agoMerge branch 'v392-fix' into v393-fix
Florian Forster [Sun, 25 Jun 2006 08:52:53 +0000 (10:52 +0200)]
Merge branch 'v392-fix' into v393-fix

18 years agoMerge branch 'v391-fix' into v392-fix collectd-3.9.2
Florian Forster [Sun, 25 Jun 2006 08:51:57 +0000 (10:51 +0200)]
Merge branch 'v391-fix' into v392-fix

18 years agoApplied all the changes that `git-svnimport' missed. collectd-3.9.1
Florian Forster [Sun, 25 Jun 2006 08:50:41 +0000 (10:50 +0200)]
Applied all the changes that `git-svnimport' missed.

18 years agoMerge branch 'v390-fix' into v391-fix
Florian Forster [Sun, 25 Jun 2006 08:48:42 +0000 (10:48 +0200)]
Merge branch 'v390-fix' into v391-fix

18 years agoApplied all the changes that `git-svnimport' missed. collectd-3.9.0
Florian Forster [Sun, 25 Jun 2006 08:42:32 +0000 (10:42 +0200)]
Applied all the changes that `git-svnimport' missed.

18 years agoCopied missing files from the subversion repository.
Florian Forster [Sun, 25 Jun 2006 08:36:10 +0000 (10:36 +0200)]
Copied missing files from the subversion repository.

18 years agoSet `operating_mode' to a defined state, even if not linking with librrd.
Florian Forster [Sun, 25 Jun 2006 08:27:04 +0000 (10:27 +0200)]
Set `operating_mode' to a defined state, even if not linking with librrd.

18 years agoAdded information about version 3.9.4 to `collectd.spec' and `debian/changelog'.
Florian Forster [Sun, 18 Jun 2006 17:53:40 +0000 (19:53 +0200)]
Added information about version 3.9.4 to `collectd.spec' and `debian/changelog'.

18 years agoAdded a ChangeLog entry about 3.9.4.
Florian Forster [Sun, 18 Jun 2006 17:03:59 +0000 (19:03 +0200)]
Added a ChangeLog entry about 3.9.4.

It containes information about the Solaris fixes by Christophe Kalt.

18 years agoprocesses branch: Implement cputime consumed by specific processes.
Florian Forster [Sun, 18 Jun 2006 16:16:46 +0000 (18:16 +0200)]
processes branch: Implement cputime consumed by specific processes.

18 years agoprocesses branch: Check for `linux/config.h' in the configure script.
Florian Forster [Sun, 18 Jun 2006 15:42:09 +0000 (17:42 +0200)]
processes branch: Check for `linux/config.h' in the configure script.

It's used to get the HZ value.

18 years agoprocesses branch: Added code to actually write the RSS data of a process.
Florian Forster [Sun, 18 Jun 2006 13:22:52 +0000 (15:22 +0200)]
processes branch: Added code to actually write the RSS data of a process.

18 years agoprocesses branch: Change many types and includes.
Florian Forster [Sun, 18 Jun 2006 13:06:29 +0000 (15:06 +0200)]
processes branch: Change many types and includes.

Also convert jiffies to useconds and (rss) pages to bytes.

18 years agoprocesses branch: Fixed the collection of LWP statistics.
Florian Forster [Sun, 18 Jun 2006 10:00:07 +0000 (12:00 +0200)]
processes branch: Fixed the collection of LWP statistics.

It's working now, but doesn't write any RRD files yet.

18 years agoprocesses plugin: Implemented a config-hook.
Florian Forster [Sat, 17 Jun 2006 21:27:36 +0000 (23:27 +0200)]
processes plugin: Implemented a config-hook.

Also fixed typos.

18 years agoMerge branch 'processes-fix' into processes
Florian Forster [Sat, 17 Jun 2006 19:16:31 +0000 (21:16 +0200)]
Merge branch 'processes-fix' into processes

18 years agoMerge branches 'processes-fix' and 'solaris-fixes'
Florian Forster [Sat, 17 Jun 2006 19:15:42 +0000 (21:15 +0200)]
Merge branches 'processes-fix' and 'solaris-fixes'

Conflicts:

src/swap.c

18 years agoprocesses plugin: Added some more error- and debug-messages.
Florian Forster [Sat, 17 Jun 2006 18:33:18 +0000 (20:33 +0200)]
processes plugin: Added some more error- and debug-messages.

Mostly to play with the merging of git, though ;)

18 years agoMerge branch 'master' into processes
Florian Forster [Sat, 17 Jun 2006 18:15:23 +0000 (20:15 +0200)]
Merge branch 'master' into processes

18 years agoMerge branch 'master-merge' into processes
Florian Forster [Sat, 17 Jun 2006 18:14:15 +0000 (20:14 +0200)]
Merge branch 'master-merge' into processes

18 years agoocto@leeloo:~/collectd $ svn merge -r822:823 branches/disk-linux trunk
octo [Fri, 16 Jun 2006 23:02:01 +0000 (23:02 +0000)]
octo@leeloo:~/collectd $ svn merge -r822:823 branches/disk-linux trunk

18 years agoocto@leeloo:~/collectd $ svn merge -r786:HEAD branches/freebsd trunk
octo [Thu, 15 Jun 2006 21:51:52 +0000 (21:51 +0000)]
octo@leeloo:~/collectd $ svn merge -r786:HEAD branches/freebsd trunk