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

[Florian Forster]

 .gitignore                   |    4 +
 contrib/collectd-network.py  |  318 ------------------------------------------
 contrib/collectd-unixsock.py |  111 ---------------
 contrib/collectd_network.py  |  318 ++++++++++++++++++++++++++++++++++++++++++
 contrib/collectd_unixsock.py |  201 ++++++++++++++++++++++++++
 5 files changed, 523 insertions(+), 429 deletions(-)

New commits:
commit 125e5cc99a45773dc7559e5478564fbc52f16623
Merge: 6be4515194055e3530e2aed9ec445c00bce50c25 19a08d266f623d3697b5ca55689bd57eeaae46a6
Author: Florian Forster <octo at noris.net>
Date:   Wed Oct 21 11:36:17 2009 +0200

    Merge branch 'collectd-4.8'

commit 19a08d266f623d3697b5ca55689bd57eeaae46a6
Merge: 8ea23471ba3a464fce7bfcd46fb8d9b07f48d5ab c1c52083b2a732269aa464c8ad0ce454cfbc01ce
Author: Florian Forster <octo at noris.net>
Date:   Wed Oct 21 11:34:07 2009 +0200

    Merge branch 'collectd-4.7' into collectd-4.8
    
    Conflicts:
    	.gitignore

commit c1c52083b2a732269aa464c8ad0ce454cfbc01ce
Author: Garret Heaton <powdahound at gmail.com>
Date:   Sun Oct 18 15:34:13 2009 -0700

    contrib/collectd_unixsock.py: Support all plain text protocol commands
    
    Also rename class from Collect to Collectd and improve output when run
    as standalone script.

commit 821de017c1528a814451d6e60a69686ef52a9eed
Author: Garret Heaton <powdahound at gmail.com>
Date:   Sun Oct 18 14:19:26 2009 -0700

    contrib/collectd_unixsock.py: Follow Python PEP-8 syntax requirements.
    
    Also remove comment which seems to refer to a file outside of the
    collectd project.

commit e5f3dbb9086cdc9fc8e66ccb1865d0bcd8c0ddfc
Author: Garret Heaton <powdahound at gmail.com>
Date:   Sun Oct 18 14:09:26 2009 -0700

    gitignore: Ignore compiled python files

commit 2499ec300378f4c89ade915f8fae834d8ca3a25b
Author: Garret Heaton <powdahound at gmail.com>
Date:   Sun Oct 18 14:06:22 2009 -0700

    Replace dashes with underscores in python modules
    
    It's not possible to import python modules with dashes in the name.
    See http://bit.ly/2t7fcy for more information.

commit 8ea23471ba3a464fce7bfcd46fb8d9b07f48d5ab
Author: Garret Heaton <powdahound at gmail.com>
Date:   Sun Oct 18 13:29:23 2009 -0700

    Ignore more java bindings classes