diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-15 16:28:30 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-15 16:28:30 +0100 |
| commit | 4d1a8718b57390a8b6c2db8d2c8d836de1651b0b (patch) | |
| tree | d1695c9c36bb475f3d63fea968e8b435890f803e /changelog.d | |
| parent | fix typo (diff) | |
| parent | Merge pull request #3653 from matrix-org/erikj/split_federation (diff) | |
| download | synapse-neilj/update_limits_error_codes.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/update_limits_error_codes github/neilj/update_limits_error_codes neilj/update_limits_error_codes
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/3653.feature | 1 | ||||
| -rw-r--r-- | changelog.d/3661.bugfix | 1 | ||||
| -rw-r--r-- | changelog.d/3687.feature | 2 | ||||
| -rw-r--r-- | changelog.d/3690.misc | 1 | ||||
| -rw-r--r-- | changelog.d/3697.misc | 1 |
5 files changed, 4 insertions, 2 deletions
diff --git a/changelog.d/3653.feature b/changelog.d/3653.feature new file mode 100644 index 0000000000..6c5422994f --- /dev/null +++ b/changelog.d/3653.feature @@ -0,0 +1 @@ +Support more federation endpoints on workers diff --git a/changelog.d/3661.bugfix b/changelog.d/3661.bugfix new file mode 100644 index 0000000000..f2b4703d80 --- /dev/null +++ b/changelog.d/3661.bugfix @@ -0,0 +1 @@ +Fix bug on deleting 3pid when using identity servers that don't support unbind API diff --git a/changelog.d/3687.feature b/changelog.d/3687.feature index 93b24d1acb..64b89f6411 100644 --- a/changelog.d/3687.feature +++ b/changelog.d/3687.feature @@ -1 +1 @@ -set admin email via config, to be used in error messages where the user should contact the administrator +set admin uri via config, to be used in error messages where the user should contact the administrator diff --git a/changelog.d/3690.misc b/changelog.d/3690.misc new file mode 100644 index 0000000000..710add0243 --- /dev/null +++ b/changelog.d/3690.misc @@ -0,0 +1 @@ +Rename MAU prometheus metrics diff --git a/changelog.d/3697.misc b/changelog.d/3697.misc deleted file mode 100644 index 9082fc4662..0000000000 --- a/changelog.d/3697.misc +++ /dev/null @@ -1 +0,0 @@ -update resource limit error codes |