Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

561133c3

Unverified Commit 561133c3 authored 5 years ago by Erik Johnston Committed by GitHub 5 years ago

Downloads
- Plain Diff

Merge pull request #6263 from matrix-org/erikj/caches_return_deferreds

Quick fix to ensure cache descriptors always return deferreds

parents e419c44b e6c7e239

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/6263.misc 1 addition, 0 deletions

changelog.d/6263.misc
synapse/push/bulk_push_rule_evaluator.py 1 addition, 1 deletion

synapse/push/bulk_push_rule_evaluator.py
synapse/storage/data_stores/main/roommember.py 1 addition, 1 deletion

synapse/storage/data_stores/main/roommember.py
synapse/util/caches/descriptors.py 4 additions, 5 deletions

synapse/util/caches/descriptors.py
tests/util/caches/test_descriptors.py 2 additions, 2 deletions

tests/util/caches/test_descriptors.py

with 9 additions and 9 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment