diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-11-04 18:09:50 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-11-04 18:09:50 +0000 |
| commit | e252ffadbc1df609d9455e0bfbc68dfe5cd146ee (patch) | |
| tree | d52bb449ff87f53597a92ceccf8b5079f520c6eb /changelog.d | |
| parent | Print out the actual number of affected rows (diff) | |
| parent | Remove the psutil dependency (#6318) (diff) | |
| download | synapse-e252ffadbc1df609d9455e0bfbc68dfe5cd146ee.tar.xz | |
Merge branch 'develop' into babolivier/msc2326_bg_update
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/6305.misc | 1 | ||||
| -rw-r--r-- | changelog.d/6318.misc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/6305.misc b/changelog.d/6305.misc new file mode 100644 index 0000000000..f047fc3062 --- /dev/null +++ b/changelog.d/6305.misc @@ -0,0 +1 @@ +Add some documentation about worker replication. 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. |