[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 ChangeLog      |   36 ++++++++++++++++++++++++++++++++++++
 src/network.c  |   13 +++++++------
 src/oracle.c   |   35 +++++++++++++++++++++++++++++++++++
 version-gen.sh |    2 +-
 4 files changed, 79 insertions(+), 7 deletions(-)

New commits:
commit eeae8f7fd3b1bbad7fbcfef7bde35a7b20148c87
Merge: c7565f60af85bff6e04b52bed4703cf9ab35f3eb 557b23d4bc8eb6ca64eab72b2d768112486f5001
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Dec 18 11:26:52 2009 +0100

    Merge branch 'collectd-4.9'

commit 557b23d4bc8eb6ca64eab72b2d768112486f5001
Merge: 5ad3a491af300d7336112607e20b0364d1f3f2bb a4ddcbc7984bd1fd62d3b973ef4c371d95da7dbf
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Dec 18 11:26:20 2009 +0100

    Merge branch 'collectd-4.8' into collectd-4.9
    
    Conflicts:
    	ChangeLog

commit a4ddcbc7984bd1fd62d3b973ef4c371d95da7dbf
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Dec 18 09:50:36 2009 +0100

    Bumped version to 4.8.2; Updated ChangeLog.

commit 72fefab2a6bf8111fb68816a1c1da30afa5c2d92
Merge: a86c1a6b695f5f967fb102da12a9f93dcee26ed3 a664c795f60b31a2dbd34e1a615a583b47002a07
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Dec 18 09:43:36 2009 +0100

    Merge branch 'collectd-4.7' into collectd-4.8
    
    Network plugin license change with Aman Gupta's permission.
    
    Conflicts:
    	ChangeLog
    	version-gen.sh

commit a664c795f60b31a2dbd34e1a615a583b47002a07
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Dec 18 09:32:15 2009 +0100

    Bumped version to 4.7.5; Updated ChangeLog.

commit 00a87614c6652bf67be9d717dc4ef9efd703f552
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Oct 1 21:27:40 2009 +0200

    src/plugin.c: plugin_log: Print to stderr if no log plugin has been loaded.

commit 7ec4487eaf46b35d3860d177c65cae9cf9ab2b89
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Dec 16 12:50:41 2009 +0100

    network plugin: Change the license to LGPL 2.1.
    
    This is done with Amit Gupta's consent. He did write changes for later versions
    of the plugin.

commit f3aa145da46d4acc19cfcb105716ff9c0cf41cbe
Author: Florian Forster <octo at noris.net>
Date:   Wed Dec 16 10:45:54 2009 +0100

    oracle plugin: Check the connection status and reconnect if required.