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

[Florian Forster]

 configure.in   |    2 +-
 contrib/README |   15 +++++++++++++--
 version-gen.sh |   14 ++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

New commits:
commit 66ade8b7294e88030555575fdba4e90867f62599
Merge: 1ec7adf09a1df8b4b38330869c95a12eca15017a 7fb30eb66bae170357dc3b568ff1934ad9ed2c2d
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Aug 22 16:36:10 2007 +0200

    Merge branch 'sh/master'
    
    Conflicts:
    
    	configure.in

commit 7fb30eb66bae170357dc3b568ff1934ad9ed2c2d
Author: Sebastian Harl <sh at tokkee.org>
Date:   Thu Aug 9 23:12:54 2007 +0200

    contrib/README: Updated information about collection.cgi.
    
    The list of required Perl modules has been updated and some instructions
    how to install the script have been added. Also a note about the config
    file required since version 4 has been added.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 1b739da931a8edb0e3a1c283fd464c4fd9805b67
Author: Sebastian Harl <sh at tokkee.org>
Date:   Thu Jul 26 18:13:18 2007 +0200

    configure.in: Generate version dynamically using version-gen.sh.
    
    This dynamically creates the version string when the configure script is
    created. If run from within a repository the output of "git describe" is
    used to create the version string. Else it defaults to a hardcoded value
    which should be something like "$latest_version.git".
    
    The idea is to update the default version to the new version (without
    ".git" appended) as the last commit of a release cycle. This commit is
    tagged as the new version. The next commit after the release will set the
    default version to "$new_version.git".
    
    The benefit is that a pre-release with a quite well defined and unique
    version can be easily created at any time.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>