Commit 58f6738c authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Merge branch 'devel-2.4' into stable-2.5

* devel-2.4:
  rpc: Disable HTTP client pool and reduce memory consumption
  Fix assertion error on unclean master shutdown
Signed-off-by: default avatarMichael Hanselmann <>
Reviewed-by: default avatarIustin Pop <>
parents 1ab94e48 05927995
......@@ -372,7 +372,7 @@ class Client:
if not http_pool:
http_pool = _thread_local.GetHttpClientPool()
http_pool = http.client.HttpClientPool(_ConfigRpcCurl)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment