[squid/f14/master: 6/12] 3.1.9

Henrik Nordström hno at fedoraproject.org
Mon Oct 25 18:28:02 UTC 2010


commit ee3c98456e1a05fffa83f590b0e635afc9693c87
Merge: 6ec6446 64cc703
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Mon Oct 25 20:18:00 2010 +0200

    3.1.9

 squid.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc squid.spec
index 5f1eaf7,cd9ac94..42427e3
--- a/squid.spec
+++ b/squid.spec
@@@ -259,7 -259,10 +259,11 @@@ f
      chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
  
  %changelog
++<<<<<<< HEAD
+ * Mon Oct 25 2010 Henrik Nordstrom <henrik at henriknordstrom.net> 3.1.9-1
+ - Upstream 3.1.8 bugfix release
+ 
 -* Wed Oct 13 2010 Jiri Skala <jskala at redhat.com> - 7:3.1.8-2
 +* Mon Oct 18 2010 Jiri Skala <jskala at redhat.com> - 7:3.1.8-2
  - fixes #584161 - squid userid not added to wbpriv group
  
  * Sun Sep 05 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.8-1


More information about the scm-commits mailing list