summary refs log tree commit diff
path: root/synapse/rest/client/transactions.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-20 18:09:59 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-20 18:09:59 +0100
commit47d53b32e39d00b2e1e5db8928fa6a761f80e604 (patch)
tree41aeaaa2db2fb8031943c8f178e3b933d9686047 /synapse/rest/client/transactions.py
parentMerge commit '9f8abdcc3' into anoa/dinsic_release_1_21_x (diff)
parentCatch up after Federation Outage (split, 2): Track last successful stream ord... (diff)
downloadsynapse-47d53b32e39d00b2e1e5db8928fa6a761f80e604.tar.xz
Merge commit '17fa4c7ca' into anoa/dinsic_release_1_21_x
* commit '17fa4c7ca':
  Catch up after Federation Outage (split, 2): Track last successful stream ordering after transmission (#8247)
  Catch-up after Federation Outage (split, 1) (#8230)
  Fix type signature in simple_select_one_onecol and friends (#8241)
  Stop sub-classing object (#8249)
Diffstat (limited to 'synapse/rest/client/transactions.py')
-rw-r--r--synapse/rest/client/transactions.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/transactions.py b/synapse/rest/client/transactions.py

index 6da71dc46f..7be5c0fb88 100644 --- a/synapse/rest/client/transactions.py +++ b/synapse/rest/client/transactions.py
@@ -25,7 +25,7 @@ logger = logging.getLogger(__name__) CLEANUP_PERIOD_MS = 1000 * 60 * 30 # 30 mins -class HttpTransactionCache(object): +class HttpTransactionCache: def __init__(self, hs): self.hs = hs self.auth = self.hs.get_auth()