diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-17 13:58:40 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-17 13:58:40 +0100 |
commit | 9fd161c6fb93d2ab2d297e5190e1faaebbd7c892 (patch) | |
tree | f0439ed7a668a2b0d627b78aaab25b03a2fb6514 /changelog.d | |
parent | server limits config docs (diff) | |
parent | Merge branch 'develop' into neilj/limit_exceeded_error (diff) | |
download | synapse-9fd161c6fb93d2ab2d297e5190e1faaebbd7c892.tar.xz |
Merge branch 'neilj/limit_exceeded_error' of github.com:matrix-org/synapse into neilj/limit_exceeded_error
Diffstat (limited to 'changelog.d')
-rw-r--r-- | changelog.d/3705.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/3707.misc | 1 | ||||
-rw-r--r-- | changelog.d/3708.feature | 1 | ||||
-rw-r--r-- | changelog.d/3712.misc | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/changelog.d/3705.bugfix b/changelog.d/3705.bugfix new file mode 100644 index 0000000000..6c5422994f --- /dev/null +++ b/changelog.d/3705.bugfix @@ -0,0 +1 @@ +Support more federation endpoints on workers diff --git a/changelog.d/3707.misc b/changelog.d/3707.misc new file mode 100644 index 0000000000..8123ca6543 --- /dev/null +++ b/changelog.d/3707.misc @@ -0,0 +1 @@ +add new error type ResourceLimit diff --git a/changelog.d/3708.feature b/changelog.d/3708.feature new file mode 100644 index 0000000000..2f146ba62b --- /dev/null +++ b/changelog.d/3708.feature @@ -0,0 +1 @@ +For resource limit blocked users, prevent writing into rooms diff --git a/changelog.d/3712.misc b/changelog.d/3712.misc new file mode 100644 index 0000000000..30f8c2af21 --- /dev/null +++ b/changelog.d/3712.misc @@ -0,0 +1 @@ +Update admin register API documentation to reference a real user ID. |