diff options
| author | Zuul <zuul@review.opendev.org> | 2022-05-05 07:03:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-05-05 07:03:16 +0000 |
| commit | bff6e5f8fb9080eacab501a15510f627547e26df (patch) | |
| tree | 21c594afcd11c1b9020fdaf7cf5904ee39eada26 /etc | |
| parent | 0b1cc8b0c4c7480549770596aacb439158ba8060 (diff) | |
| parent | 11b9761cdf0fb7a00b1add913a0be31d8e8b93da (diff) | |
| download | swift-bff6e5f8fb9080eacab501a15510f627547e26df.tar.gz | |
Merge "Rip out pickle support in our memcached client"
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/memcache.conf-sample | 10 | ||||
| -rw-r--r-- | etc/proxy-server.conf-sample | 12 |
2 files changed, 0 insertions, 22 deletions
diff --git a/etc/memcache.conf-sample b/etc/memcache.conf-sample index b375eb402..f85e49edc 100644 --- a/etc/memcache.conf-sample +++ b/etc/memcache.conf-sample @@ -5,16 +5,6 @@ # (IPv6 addresses must follow rfc3986 section-3.2.2, i.e. [::1]:11211) # memcache_servers = 127.0.0.1:11211 # -# Sets how memcache values are serialized and deserialized: -# 0 = older, insecure pickle serialization -# 1 = json serialization but pickles can still be read (still insecure) -# 2 = json serialization only (secure and the default) -# To avoid an instant full cache flush, existing installations should -# upgrade with 0, then set to 1 and reload, then after some time (24 hours) -# set to 2 and reload. -# In the future, the ability to use pickle serialization will be removed. -# memcache_serialization_support = 2 -# # Sets the maximum number of connections to each memcached server per worker # memcache_max_connections = 2 # diff --git a/etc/proxy-server.conf-sample b/etc/proxy-server.conf-sample index ef49c430f..44a456219 100644 --- a/etc/proxy-server.conf-sample +++ b/etc/proxy-server.conf-sample @@ -740,18 +740,6 @@ use = egg:swift#memcache # follow rfc3986 section-3.2.2, i.e. [::1]:11211) # memcache_servers = 127.0.0.1:11211 # -# Sets how memcache values are serialized and deserialized: -# 0 = older, insecure pickle serialization -# 1 = json serialization but pickles can still be read (still insecure) -# 2 = json serialization only (secure and the default) -# If not set here, the value for memcache_serialization_support will be read -# from /etc/swift/memcache.conf (see memcache.conf-sample). -# To avoid an instant full cache flush, existing installations should -# upgrade with 0, then set to 1 and reload, then after some time (24 hours) -# set to 2 and reload. -# In the future, the ability to use pickle serialization will be removed. -# memcache_serialization_support = 2 -# # Sets the maximum number of connections to each memcached server per worker # memcache_max_connections = 2 # |