diff options
author | Erik Johnston <erik@matrix.org> | 2019-11-05 10:27:41 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-11-05 10:27:41 +0000 |
commit | ffe595381d508bc4b7ff1acbfb03b8d280da03a3 (patch) | |
tree | d9dac65c36d01814fdd97d78f0d4315b38ba30ad /changelog.d | |
parent | Change to not require a state_groups.room_id index. (diff) | |
parent | Remove the psutil dependency (#6318) (diff) | |
download | synapse-ffe595381d508bc4b7ff1acbfb03b8d280da03a3.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history
Diffstat (limited to 'changelog.d')
-rw-r--r-- | changelog.d/6318.misc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/6318.misc b/changelog.d/6318.misc new file mode 100644 index 0000000000..63527ccef4 --- /dev/null +++ b/changelog.d/6318.misc @@ -0,0 +1 @@ +Remove the dependency on psutil and replace functionality with the stdlib `resource` module. |