diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-09-08 11:20:31 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-08 11:20:31 +0000 |
| commit | d34dc4a7469b97e28ca4fffc8b2387c937ab56d8 (patch) | |
| tree | 5920e433356a6e118443298cabf8dff2384ee921 /CHANGELOG.md | |
| parent | c5434dbefc5e6a25ffb72debe8ed9e09d77bf885 (diff) | |
| parent | d8a48f838697ce6f1d37f5504c1e51b316aed037 (diff) | |
| download | pleroma-d34dc4a7469b97e28ca4fffc8b2387c937ab56d8.tar.gz pleroma-d34dc4a7469b97e28ca4fffc8b2387c937ab56d8.zip | |
Merge branch 'fix/2108-adapter-options' into 'develop'
Adapter options unification
Closes #2108
See merge request pleroma/pleroma!2952
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 46f1e859b..e6180a6da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased +### Changed + +- Renamed `:await_up_timeout` in `:connections_pool` namespace to `:connect_timeout`, old name is deprecated. +- Renamed `:timeout` in `pools` namespace to `:recv_timeout`, old name is deprecated. + ### Removed - **Breaking:** Removed `Pleroma.Workers.Cron.StatsWorker` setting from Oban `:crontab`. - ## unreleased-patch - ??? ### Added @@ -25,7 +29,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mastodon API: Cards being wrong for preview statuses due to cache key collision - Password resets no longer processed for deactivated accounts - ## [2.1.0] - 2020-08-28 ### Changed |