Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix sample config docs error #7581

Merged

Conversation

jaywink
Copy link
Member

@jaywink jaywink commented May 27, 2020

'client_auth_method' commented out value was erronously 'client_auth_basic',
when code and docstring says it should be 'client_secret_basic'.

Signed-off-by: Jason Robinson [email protected]

@jaywink jaywink requested a review from a team May 27, 2020 12:40
Copy link
Member

@anoadragon453 anoadragon453 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good spot, thanks!

@anoadragon453 anoadragon453 changed the base branch from develop to release-v1.14.0 May 27, 2020 12:47
'client_auth_method' commented out value was erronously 'client_auth_basic',
when code and docstring says it should be 'client_secret_basic'.

Signed-off-by: Jason Robinson <[email protected]>
@anoadragon453 anoadragon453 force-pushed the jaywink/fix-error-in-oidc-sample-config branch from 863256d to 42c92fe Compare May 27, 2020 12:48
@anoadragon453
Copy link
Member

Rebasing to the release-v1.14.0 branch as it concerns an unreleased feature.

@anoadragon453 anoadragon453 merged commit 4be968d into release-v1.14.0 May 27, 2020
@anoadragon453 anoadragon453 deleted the jaywink/fix-error-in-oidc-sample-config branch May 27, 2020 12:52
babolivier added a commit that referenced this pull request May 27, 2020
Synapse 1.14.0rc2 (2020-05-27)
==============================

Bugfixes
--------

- Fix cache config to not apply cache factor to event cache. Regression in v1.14.0rc1. ([\#7578](#7578))
- Fix bug where `ReplicationStreamer` was not always started when replication was enabled. Bug introduced in v1.14.0rc1. ([\#7579](#7579))
- Fix specifying individual cache factors for caches with special characters in their name. Regression in v1.14.0rc1. ([\#7580](#7580))

Improved Documentation
----------------------

- Fix the OIDC `client_auth_method` value in the sample config. ([\#7581](#7581))
phil-flex pushed a commit to phil-flex/synapse that referenced this pull request Jun 16, 2020
'client_auth_method' commented out value was erronously 'client_auth_basic',
when code and docstring says it should be 'client_secret_basic'.

Signed-off-by: Jason Robinson <[email protected]>
babolivier pushed a commit that referenced this pull request Sep 1, 2021
…dinsic-release-v1.14.x

* 'release-v1.14.0' of github.com:matrix-org/synapse: (108 commits)
  Fix typo in PR link
  Update debian changelog
  1.14.0
  Improve changelog wording
  1.14.0rc2
  Fix sample config docs error (#7581)
  Fix up comments
  Fix specifying cache factors via env vars with * in name. (#7580)
  Don't apply cache factor to event cache. (#7578)
  Ensure ReplicationStreamer is always started when replication enabled. (#7579)
  Remove the changes to the debian changelog
  Not full release yet, this is rc1
  Merge event persistence move changelog entries
  More changelog fix
  Changelog fixes
  1.14.0
  Replace device_27_unique_idx bg update with a fg one (#7562)
  Fix incorrect exception handling in KeyUploadServlet.on_POST (#7563)
  Fix recording of federation stream token (#7564)
  Simplify reap_monthly_active_users (#7558)
  ...
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants