summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-11-04 18:22:41 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-11-04 18:22:41 +0000
commit506a63de67b63e09b500f377afd8074e25ea0d83 (patch)
tree2c311b5c243ac8567f27aae7ba1a0dd2a6a0a1cd /changelog.d
parentRe-add docstring, with caveats detailed (diff)
parentRemove the psutil dependency (#6318) (diff)
downloadsynapse-506a63de67b63e09b500f377afd8074e25ea0d83.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrade_groups
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/6318.misc1
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.