Merge branch 'master' into el5
Conflicts: .gitignore cacti.spec
This commit is contained in:
commit
3336efd173
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,2 @@
|
|||||||
cacti-0.8.6j.tar.gz
|
cacti-0.8.7g.tar.gz
|
||||||
/cacti-0.8.7h.tar.gz
|
/cacti-0.8.7h.tar.gz
|
||||||
|
12
cacti.spec
12
cacti.spec
@ -107,11 +107,15 @@ fi
|
|||||||
%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
|
%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Oct 24 2011 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.8.7h-1
|
* Thu Oct 27 2011 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.8.7h-1
|
||||||
- Upstream released new version (#748451)
|
- New upstream release.
|
||||||
|
- Remove upstream'd mysql patch.
|
||||||
|
|
||||||
* Thu May 26 2011 Ken Dreyer <ktdreyer@ktdreyer.com> 0.8.7g-1.el5.1
|
* Mon Aug 08 2011 Jon Ciesla <limb@jcomserv.net> - 0.8.7g-3
|
||||||
- Bump dist for koji.
|
- 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
|
* Mon Jul 12 2010 Mike McGrath <mmcgrath@redhat.com> 0.8.7g-1
|
||||||
- Upstream released new version
|
- Upstream released new version
|
||||||
|
Loading…
Reference in New Issue
Block a user