From 58dd0462a76b9980b9027b854d4bf482ac2d819597dfc20c56feed47c2f7e925 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Wed, 17 Oct 2018 14:01:25 +0000 Subject: [PATCH 1/2] Accepting request 642630 from home:nicolasbock:branches:network:utilities - Version bump to 1.5.11 - Drop fix_test patch that is present now upstream OBS-URL: https://build.opensuse.org/request/show/642630 OBS-URL: https://build.opensuse.org/package/show/network:utilities/memcached?expand=0&rev=60 --- memcached-1.5.10.tar.gz | 3 --- memcached-1.5.11.tar.gz | 3 +++ memcached-fix_test.patch | 32 -------------------------------- memcached.changes | 6 ++++++ memcached.spec | 4 +--- 5 files changed, 10 insertions(+), 38 deletions(-) delete mode 100644 memcached-1.5.10.tar.gz create mode 100644 memcached-1.5.11.tar.gz delete mode 100644 memcached-fix_test.patch diff --git a/memcached-1.5.10.tar.gz b/memcached-1.5.10.tar.gz deleted file mode 100644 index 42842af..0000000 --- a/memcached-1.5.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:494c060dbd96d546c74ab85a3cc3984d009b4423767ac33e05dd2340c01f1c4b -size 465169 diff --git a/memcached-1.5.11.tar.gz b/memcached-1.5.11.tar.gz new file mode 100644 index 0000000..c4b04cf --- /dev/null +++ b/memcached-1.5.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:697a91f8455865ca2625713c6ec56cb5f6b9541778f61d08bf34f0a131a2582a +size 457692 diff --git a/memcached-fix_test.patch b/memcached-fix_test.patch deleted file mode 100644 index 20f22e6..0000000 --- a/memcached-fix_test.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b2b574ae46454d7016012bf8b40a2d24cd723e60 Mon Sep 17 00:00:00 2001 -From: dormando -Date: Fri, 10 Aug 2018 15:31:22 -0700 -Subject: [PATCH] t/lru-maintainer.t: check for WARM item earlier - -item might get pushed back out as we keep doing work. ---- - t/lru-maintainer.t | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/t/lru-maintainer.t b/t/lru-maintainer.t -index 04fa76ac6..adacd1b48 100644 ---- a/t/lru-maintainer.t -+++ b/t/lru-maintainer.t -@@ -68,6 +68,8 @@ for (my $key = 0; $key < 100; $key++) { - } - last; - } -+ my $istats = mem_stats($sock, "items"); -+ isnt($istats->{"items:31:number_warm"}, 0, "our canary moved to warm"); - } - print $sock "set key$key 0 0 66560\r\n$value\r\n"; - is(scalar <$sock>, "STORED\r\n", "stored key$key"); -@@ -76,8 +78,6 @@ for (my $key = 0; $key < 100; $key++) { - { - my $stats = mem_stats($sock); - isnt($stats->{evictions}, 0, "some evictions happened"); -- my $istats = mem_stats($sock, "items"); -- isnt($istats->{"items:31:number_warm"}, 0, "our canary moved to warm"); - use Data::Dumper qw/Dumper/; - } - diff --git a/memcached.changes b/memcached.changes index a0461c2..6fd76c6 100644 --- a/memcached.changes +++ b/memcached.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 17 11:51:19 UTC 2018 - Nicolas Bock + +- Version bump to 1.5.11 +- Drop fix_test patch that is present now upstream + ------------------------------------------------------------------- Wed Oct 3 11:52:39 UTC 2018 - Guillaume GARDET diff --git a/memcached.spec b/memcached.spec index 23cd0ad..29972ae 100644 --- a/memcached.spec +++ b/memcached.spec @@ -21,7 +21,7 @@ %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: memcached -Version: 1.5.10 +Version: 1.5.11 Release: 0 Summary: A high-performance, distributed memory object caching system License: BSD-3-Clause @@ -35,7 +35,6 @@ Source4: memcached.service Patch0: memcached-1.4.5.dif Patch1: memcached-autofoo.patch Patch2: memcached-use-endian_h.patch -Patch3: memcached-fix_test.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: cyrus-sasl-devel @@ -83,7 +82,6 @@ This package contains development files %patch0 %patch1 %patch2 -%patch3 -p1 %build autoreconf -fi From 16f47fed295d98e534313ddf92dcb71274b437e8471054f2e254410c324e231f Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Wed, 17 Oct 2018 14:02:09 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/network:utilities/memcached?expand=0&rev=61 --- memcached.changes | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/memcached.changes b/memcached.changes index 6fd76c6..ef0253d 100644 --- a/memcached.changes +++ b/memcached.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- Wed Oct 17 11:51:19 UTC 2018 - Nicolas Bock -- Version bump to 1.5.11 -- Drop fix_test patch that is present now upstream +- Version bump to 1.5.11: + * extstore: balance IO thread queues +- Drop memcached-fix_test.patch that is present now upstream ------------------------------------------------------------------- Wed Oct 3 11:52:39 UTC 2018 - Guillaume GARDET