Merge branch 'master' into el4

Conflicts: .gitignore cacti.spec sources
2011-10-27 12:32:41 -06:00 · 2011-10-27 12:32:41 -06:00 · ea94628ff0
commit ea94628ff0
parent 2e6f0454cd 355ddffde4
3 changed files with 15 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
-cacti-0.8.6j.tar.gz
+cacti-0.8.7g.tar.gz
+/cacti-0.8.7h.tar.gz
--- a/cacti.spec
+++ b/cacti.spec
@ -1,5 +1,5 @@
 Name: cacti
-Version: 0.8.7g
+Version: 0.8.7h
 Release: 1%{?dist}
 Summary: An rrd based graphing tool

@ -105,6 +105,17 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib

 %changelog
+=======
+* Thu Oct 27 2011 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.8.7h-1
+- New upstream release.
+- Remove upstream'd mysql patch.
+
+* Mon Aug 08 2011 Jon Ciesla <limb@jcomserv.net> - 0.8.7g-3
+- Patch for MySQL 5.5, BZ 728513.
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.7g-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Mon Jul 12 2010 Mike McGrath <mmcgrath@redhat.com> 0.8.7g-1
 - Upstream released new version

--- a/2
+++ b/2
@ -1 +1 @@
-268421cb1a58d3444f7ecbddb4c4b016  cacti-0.8.7g.tar.gz
+58c9371341f49a190ae11a85118e598d  cacti-0.8.7h.tar.gz