From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 11 Oct 2023 11:51:34 +0000 (+0200)
Subject: Merge branch 'master' into cachedb-no-store
X-Git-Tag: release-1.19.0rc1~11^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47094fd83f951d29fa3bce5c360867d5de6ae5c6;p=thirdparty%2Funbound.git

Merge branch 'master' into cachedb-no-store
---

47094fd83f951d29fa3bce5c360867d5de6ae5c6
diff --cc util/configparser.y
index 4cc52cfb9,6237d0c08..6363368e5
--- a/util/configparser.y
+++ b/util/configparser.y
@@@ -3702,7 -3703,7 +3703,7 @@@ contents_cachedb: contents_cachedb cont
  content_cachedb: cachedb_backend_name | cachedb_secret_seed |
  	redis_server_host | redis_server_port | redis_timeout |
  	redis_expire_records | redis_server_path | redis_server_password |
- 	cachedb_no_store
 -	redis_logical_db
++	cachedb_no_store | redis_logical_db
  	;
  cachedb_backend_name: VAR_CACHEDB_BACKEND STRING_ARG
  	{