Merge branch 'master' into el6
Conflicts: .gitignore cacti.spec sources
This commit is contained in:
commit
c70dd17de2
3
.gitignore
vendored
3
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
cacti-0.8.7e.tar.gz
|
cacti-0.8.7g.tar.gz
|
||||||
|
/cacti-0.8.7h.tar.gz
|
||||||
|
12
cacti.spec
12
cacti.spec
@ -1,5 +1,5 @@
|
|||||||
Name: cacti
|
Name: cacti
|
||||||
Version: 0.8.7g
|
Version: 0.8.7h
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: An rrd based graphing tool
|
Summary: An rrd based graphing tool
|
||||||
|
|
||||||
@ -105,6 +105,16 @@ fi
|
|||||||
%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
|
%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
|
||||||
|
|
||||||
%changelog
|
%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
|
* 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