diff options
| author | lain <lain@soykaf.club> | 2019-05-17 12:26:59 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-05-17 12:26:59 +0200 |
| commit | 412a3d8a0f74ee3a46f9ba98d906c65c6c1c4da8 (patch) | |
| tree | d7dc5c61e4b3a01b21e33ccbea3aa4bfffc051aa /lib/pleroma/uploaders/swift | |
| parent | f1e67bdc312ba16a37916024244d6cb9d4417c9e (diff) | |
| parent | e5b34f5e0544371603bc2b570c26ede3182c2f8b (diff) | |
| download | pleroma-412a3d8a0f74ee3a46f9ba98d906c65c6c1c4da8.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
Diffstat (limited to 'lib/pleroma/uploaders/swift')
| -rw-r--r-- | lib/pleroma/uploaders/swift/keystone.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/uploaders/swift/keystone.ex b/lib/pleroma/uploaders/swift/keystone.ex index 3046cdbd2..dd44c7561 100644 --- a/lib/pleroma/uploaders/swift/keystone.ex +++ b/lib/pleroma/uploaders/swift/keystone.ex @@ -14,7 +14,7 @@ defmodule Pleroma.Uploaders.Swift.Keystone do def process_response_body(body) do body - |> Poison.decode!() + |> Jason.decode!() end def get_token do @@ -38,7 +38,7 @@ defmodule Pleroma.Uploaders.Swift.Keystone do end def make_auth_body(username, password, tenant) do - Poison.encode!(%{ + Jason.encode!(%{ :auth => %{ :passwordCredentials => %{ :username => username, |