diff options
author | Neil Johnson <neil@matrix.org> | 2018-10-24 16:25:39 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-10-24 16:25:39 +0100 |
commit | 07126e43a4db2d898e015186902031c8311093cb (patch) | |
tree | 56c45f6cafd6ceaae2341b07de65c294327cd365 /changelog.d/4074.bugfix | |
parent | remove white space (diff) | |
parent | fix branch regexp (diff) | |
download | synapse-07126e43a4db2d898e015186902031c8311093cb.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init
Diffstat (limited to 'changelog.d/4074.bugfix')
-rw-r--r-- | changelog.d/4074.bugfix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/4074.bugfix b/changelog.d/4074.bugfix new file mode 100644 index 0000000000..b3b6b00243 --- /dev/null +++ b/changelog.d/4074.bugfix @@ -0,0 +1 @@ +Correctly account for cpu usage by background threads |