Merge branch 'master' into el5

Conflicts:
	.gitignore
	cacti.spec
This commit is contained in:
Ken Dreyer 2011-10-27 12:37:56 -06:00
commit 3336efd173
2 changed files with 9 additions and 5 deletions

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
cacti-0.8.6j.tar.gz
cacti-0.8.7g.tar.gz
/cacti-0.8.7h.tar.gz

View File

@ -107,11 +107,15 @@ fi
%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
%changelog
* Mon Oct 24 2011 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.8.7h-1
- Upstream released new version (#748451)
* Thu Oct 27 2011 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.8.7h-1
- New upstream release.
- Remove upstream'd mysql patch.
* Thu May 26 2011 Ken Dreyer <ktdreyer@ktdreyer.com> 0.8.7g-1.el5.1
- Bump dist for koji.
* 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