Revert cereal code as risk mitigation for friday push

diff --git a/Bugzilla/Memcached.pm b/Bugzilla/Memcached.pm
index bc0e2cfb7c24d11f3fd94db69609d5ed4879f58d..d34aaa595915f2622c503aac4fe8f56fc248eb5f 100644 (file)
--- a/Bugzilla/Memcached.pm
+++ b/Bugzilla/Memcached.pm
@@ -34,19 +34,17 @@ sub _new {
     # disabled.
     my $servers = Bugzilla->localconfig->{memcached_servers};
     if (Bugzilla->feature('memcached') && $servers) {
-        require Sereal;
         $self->{namespace} = Bugzilla->localconfig->{memcached_namespace};
         TRACE("connecting servers: $servers, namespace: $self->{namespace}");
         $self->{memcached} = Cache::Memcached::Fast->new(
             {
-                servers           => [ _parse_memcached_server_list($servers) ],
-                namespace         => $self->{namespace},
-                serialize_methods => { \&Sereal::Encoder::encode_sereal, \&Sereal::Decoder::decode_sereal },
-                max_size          => 1024 * 1024 * 4,
-                max_failures      => 1,
-                failure_timeout   => 60,
-                io_timeout        => 0.2,
-                connect_timeout   => 0.2,
+                servers         => [ _parse_memcached_server_list($servers) ],
+                namespace       => $self->{namespace},
+                max_size        => 1024 * 1024 * 4,
+                max_failures    => 1,
+                failure_timeout => 60,
+                io_timeout      => 0.2,
+                connect_timeout => 0.2,
             }
         );
         my $versions = $self->{memcached}->server_versions;

diff --git a/Makefile.PL b/Makefile.PL
index 5c3e9257cfa800da13ffb3b2e952d8990fe48901..46228ab5672652983015ba6f58f1e38683bed436 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -161,12 +161,7 @@ my %optional_features = (
     memcached => {
         description => 'Memcached Support',
         prereqs     => {
-            runtime => {
-                requires => {
-                    'Cache::Memcached::Fast' => '0.17',
-                    'Sereal' => '4.005'
-                }
-            }
+            runtime => { requires => { 'Cache::Memcached::Fast' => '0.17' } }
         }
     },
     updates => {