BBlack has submitted this change and it was merged.

Change subject: varnish (3.0.6plus~x-wm3) unstable; urgency=low
......................................................................


varnish (3.0.6plus~x-wm3) unstable; urgency=low

  * Merged upstream varnish 3.0.6 (final):
    * 1899836 Prepare 3.0.6.
    * 3cf2f3f Update copyright statement.
    * 80381e6 Improve description of effects of bug 1470.
    * 928b0af Forgotten version number in last commit.
    * dc17564 Prepare 3.0.6rc2.
    * 7c39957 recommend system libjemalloc
    * 5cb77b2 EL7 chroot seem not to have python by default.
    * cf06737 Add that empty string VCL truth value changed.
    * 9511eef Double allocated varnishlog buffer space.
    * 779ab3a always include config.h first
  * Updated debian/patches/ line offsets

 -- Brandon Black <[email protected]>  Wed, 22 Oct 2014 17:50:00 +0000

Change-Id: I255015853fb8f152c9ffeb0f550b41f3e39c27c6
---
M debian/changelog
M debian/patches/0010-libvmod_std-collect.patch
2 files changed, 18 insertions(+), 1 deletion(-)

Approvals:
  BBlack: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/debian/changelog b/debian/changelog
index e7510be..1219950 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+varnish (3.0.6plus~x-wm3) unstable; urgency=low
+
+  * Merged upstream varnish 3.0.6 (final):
+    * 1899836 Prepare 3.0.6.
+    * 3cf2f3f Update copyright statement.
+    * 80381e6 Improve description of effects of bug 1470.
+    * 928b0af Forgotten version number in last commit.
+    * dc17564 Prepare 3.0.6rc2.
+    * 7c39957 recommend system libjemalloc
+    * 5cb77b2 EL7 chroot seem not to have python by default.
+    * cf06737 Add that empty string VCL truth value changed.
+    * 9511eef Double allocated varnishlog buffer space.
+    * 779ab3a always include config.h first
+  * Updated debian/patches/ line offsets
+
+ -- Brandon Black <[email protected]>  Wed, 22 Oct 2014 17:50:00 +0000
+
 varnish (3.0.6plus~x-wm2) unstable; urgency=low
 
   * Added explicit persistent mmap addr support
diff --git a/debian/patches/0010-libvmod_std-collect.patch 
b/debian/patches/0010-libvmod_std-collect.patch
index 147b6df..260d598 100644
--- a/debian/patches/0010-libvmod_std-collect.patch
+++ b/debian/patches/0010-libvmod_std-collect.patch
@@ -2,7 +2,7 @@
 index 544e2dc..217f60a 100644
 --- a/lib/libvmod_std/vmod_std.c
 +++ b/lib/libvmod_std/vmod_std.c
-@@ -187,5 +187,7 @@ vmod_collect(struct sess *sp, enum gethdr_e e, const char 
*h)
+@@ -188,5 +188,7 @@ vmod_collect(struct sess *sp, enum gethdr_e e, const char 
*h)
                http_CollectHdr(sp->http, h);
        else if (e == HDR_BERESP)
                http_CollectHdr(sp->wrk->beresp, h);

-- 
To view, visit https://gerrit.wikimedia.org/r/168180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I255015853fb8f152c9ffeb0f550b41f3e39c27c6
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/varnish
Gerrit-Branch: 3.0.6-plus-wm
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to