[varnish: 22/23] merge el6

Ingvar Hagelund ingvar at fedoraproject.org
Mon Oct 25 18:28:19 UTC 2010


commit 676eccca8b7ad4cd147c05123e25550d643645a6
Merge: f73ac51 2e84a84
Author: Ingvar Hagelund <ingvar at redpill-linpro.com>
Date:   Mon Oct 25 11:39:45 2010 +0200

    merge el6

 .gitignore                         |    1 +
 varnish.ppc64_stacksize_test.patch |   11 +++++++++++
 varnish.spec                       |   22 ++++++++++++++++------
 3 files changed, 28 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 492405a,4512e76..4c9f134
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,3 @@@
+ varnish-2.0.6.tar.gz
 +varnish-2.1.2.tar.gz
  varnish-2.1.3.tar.gz
 -/varnish-2.1.3.tar.gz
diff --cc varnish.spec
index a05ca8d,c175845..a6393c4
--- a/varnish.spec
+++ b/varnish.spec
@@@ -255,6 -260,10 +260,11 @@@ f
  %postun libs -p /sbin/ldconfig
  
  %changelog
+ * Tue Aug 24 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.3-2
+ - Added a RHEL6/ppc64 specific patch for that changes the hard coded
+   stack size in tests/c00031.vtc
+ 
++>>>>>>> el6
  * Thu Jul 29 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.3-1
  - New upstream release
  - Add a patch for jemalloc on s390 that lacks upstream


More information about the scm-commits mailing list