http: connection: merge hackney option lists instead of concatenating them

this ensures the right pools are used

diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex
index b798eaa5ac63e54dc079b9ed20732f85d0a9600e..cc2e96e2b28302fc36af84ddc261a8567fddbbc4 100644 (file)
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@@ -31,6 +31,6 @@ defmodule Pleroma.HTTP.Connection do
   #
   defp hackney_options(opts) do
     options = Keyword.get(opts, :adapter, [])
-    @hackney_options ++ options
+    Keyword.merge(@hackney_options, options)
   end
 end