diff options
author | Jason Robinson <jasonr@matrix.org> | 2021-01-09 22:00:04 +0200 |
---|---|---|
committer | Jason Robinson <jasonr@matrix.org> | 2021-01-09 22:00:04 +0200 |
commit | 2eb421b606c1ab3c720f510abbd6dc9ad25c0673 (patch) | |
tree | f69dde7b789a3c8bfe06a12a46792c92ffa05a1d /changelog.d | |
parent | Implement clearing cache after deleting forward extremities (diff) | |
parent | Keycloak mapping_provider example (#9037) (#9057) (diff) | |
download | synapse-2eb421b606c1ab3c720f510abbd6dc9ad25c0673.tar.xz |
Merge branch 'develop' into jaywink/admin-forward-extremities
Diffstat (limited to 'changelog.d')
-rw-r--r-- | changelog.d/9036.feature | 1 | ||||
-rw-r--r-- | changelog.d/9038.misc | 1 | ||||
-rw-r--r-- | changelog.d/9039.removal | 1 | ||||
-rw-r--r-- | changelog.d/9051.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/9053.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/9054.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/9057.doc | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/changelog.d/9036.feature b/changelog.d/9036.feature new file mode 100644 index 0000000000..01a24dcf49 --- /dev/null +++ b/changelog.d/9036.feature @@ -0,0 +1 @@ +Add support for multiple SSO Identity Providers. diff --git a/changelog.d/9038.misc b/changelog.d/9038.misc new file mode 100644 index 0000000000..5b9e21a1db --- /dev/null +++ b/changelog.d/9038.misc @@ -0,0 +1 @@ +Configure the linters to run on a consistent set of files. diff --git a/changelog.d/9039.removal b/changelog.d/9039.removal new file mode 100644 index 0000000000..fb99283ed8 --- /dev/null +++ b/changelog.d/9039.removal @@ -0,0 +1 @@ +Remove broken and unmaintained `demo/webserver.py` script. diff --git a/changelog.d/9051.bugfix b/changelog.d/9051.bugfix new file mode 100644 index 0000000000..272be9d7a3 --- /dev/null +++ b/changelog.d/9051.bugfix @@ -0,0 +1 @@ +Fix error handling during insertion of client IPs into the database. diff --git a/changelog.d/9053.bugfix b/changelog.d/9053.bugfix new file mode 100644 index 0000000000..3d8bbf11a1 --- /dev/null +++ b/changelog.d/9053.bugfix @@ -0,0 +1 @@ +Fix bug where we didn't correctly record CPU time spent in 'on_new_event' block. diff --git a/changelog.d/9054.bugfix b/changelog.d/9054.bugfix new file mode 100644 index 0000000000..0bfe951f17 --- /dev/null +++ b/changelog.d/9054.bugfix @@ -0,0 +1 @@ +Fix a minor bug which could cause confusing error messages from invalid configurations. diff --git a/changelog.d/9057.doc b/changelog.d/9057.doc new file mode 100644 index 0000000000..d16686e7dc --- /dev/null +++ b/changelog.d/9057.doc @@ -0,0 +1 @@ +Add missing user_mapping_provider configuration to the Keycloak OIDC example. Contributed by @chris-ruecker. |