Correct release after merge conflict
This commit is contained in:
parent
6e8afcc6c0
commit
144e99dcf9
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
Name: squid
|
Name: squid
|
||||||
Version: 3.2.0.14
|
Version: 3.2.0.14
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: The Squid proxy caching server
|
Summary: The Squid proxy caching server
|
||||||
Epoch: 7
|
Epoch: 7
|
||||||
# See CREDITS for breakdown of non GPLv2+ code
|
# See CREDITS for breakdown of non GPLv2+ code
|
||||||
@ -316,7 +316,7 @@ fi
|
|||||||
/sbin/chkconfig --add squid >/dev/null 2>&1 || :
|
/sbin/chkconfig --add squid >/dev/null 2>&1 || :
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Jan 17 2012 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.2.0.14-4
|
* Tue Jan 17 2012 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.2.0.14-6
|
||||||
- upstream gcc-4.7 patch
|
- upstream gcc-4.7 patch
|
||||||
- fix for bug #772483 running out of memory, mem_node growing out of bounds
|
- fix for bug #772483 running out of memory, mem_node growing out of bounds
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user