[collectd: 20/20] New upstream version 4.10.0 (thanks to Mike McGrath)

[Robert Scheck]

commit 95ea28ab661197bd02dd801023a0ff20fcbc2c18
Merge: 16c2d34 8d33774
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Sep 19 14:31:56 2010 +0200

    New upstream version 4.10.0 (thanks to Mike McGrath)

 .gitignore          |    2 +-
 collectd-httpd.conf |   12 +
 collectd.spec       |   69 +++++-
 collection.conf     |  670 +++++++++++++++++++++++++++++++++++++++++++++++++++
 sources             |    2 +-
 5 files changed, 742 insertions(+), 13 deletions(-)
---
diff --cc collectd.spec
index ef4ccc3,4d941b0..de38baa
--- a/collectd.spec
+++ b/collectd.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: Statistics collection daemon for filling RRD files
  Name: collectd
- Version: 4.9.2
+ Version: 4.10.0
 -Release: 4%{?dist}
 +Release: 1%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  URL: http://collectd.org/
@@@ -358,10 -393,11 +393,11 @@@ f
  %doc %{_mandir}/man5/collectd.conf.5*
  %doc %{_mandir}/man5/collectd-exec.5*
  %doc %{_mandir}/man5/collectd-java.5*
+ %doc %{_mandir}/man5/collectd-python.5*
  %doc %{_mandir}/man5/collectd-unixsock.5*
 +%doc %{_mandir}/man5/collectd-python.5*
  %doc %{_mandir}/man5/types.db.5*
  
 -
  %files apache
  %defattr(-, root, root, -)
  %{_libdir}/collectd/apache.so
@@@ -452,22 -496,22 +496,25 @@@
  %defattr(-, root, root, -)
  %{_libdir}/collectd/libvirt.so
  %config(noreplace) %{_sysconfdir}/collectd.d/libvirt.conf
- 
+ %endif
  
  %changelog
 -* Thu Jun 10 2010 Mike McGrath <mmcgrath at redhat.com> 4.10.0-4
 -- New upstram version
 -- First EL-5 build
++* Sun Sep 19 2010 Robert Scheck <robert at fedoraproject.org> 4.10.0-1
++- New upstream version 4.10.0 (thanks to Mike McGrath)
+ 
 -* Tue Jun 08 2010 Alan Pevec <apevec at redhat.com> 4.8.5-1
 -- New upstream version 4.8.5
 +* Tue Jun 08 2010 Alan Pevec <apevec at redhat.com> 4.9.2-1
 +- New upstream version 4.9.2
    http://collectd.org/news.shtml#news83
  
 -* Fri Mar 26 2010 Alan Pevec <apevec at redhat.com> 4.8.3-3
 +* Thu Apr 29 2010 Marcela Maslanova <mmaslano at redhat.com> - 4.9.1-3
 +- Mass rebuild with perl-5.12.0
 +
 +* Fri Mar 26 2010 Alan Pevec <apevec at redhat.com> 4.9.1-2
  - enable ping plugin bz#541744
  
 -* Wed Mar 17 2010 Mike McGrath <mmcgrath at redhat.com> 4.8.3-2
 -- Added web interface
 +* Mon Mar 08 2010 Lubomir Rintel <lkundrak at v3.sl> 4.9.1-1
 +- New upstream version 4.9.1
 +  http://collectd.org/news.shtml#news81
  
  * Tue Feb 16 2010 Alan Pevec <apevec at redhat.com> 4.8.3-1
  - New upstream version 4.8.3