diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-11-03 12:58:57 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-11-03 12:58:57 +0000 |
| commit | 71a452a324e45c338c6d91e6b17b92712157367c (patch) | |
| tree | 2f95a26c9c8ff024c855ed7a8ca674e833dddca8 /synapse/storage/directory.py | |
| parent | more comment (diff) | |
| parent | fix tests (diff) | |
| download | synapse-71a452a324e45c338c6d91e6b17b92712157367c.tar.xz | |
Merge branch 'dinsic' into matthew/shadow-server
Diffstat (limited to 'synapse/storage/directory.py')
| -rw-r--r-- | synapse/storage/directory.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/storage/directory.py b/synapse/storage/directory.py index 808194236a..61a029a53c 100644 --- a/synapse/storage/directory.py +++ b/synapse/storage/directory.py @@ -75,7 +75,6 @@ class DirectoryWorkerStore(SQLBaseStore): }, retcol="creator", desc="get_room_alias_creator", - allow_none=True ) @cached(max_entries=5000) @@ -91,7 +90,7 @@ class DirectoryWorkerStore(SQLBaseStore): class DirectoryStore(DirectoryWorkerStore): @defer.inlineCallbacks def create_room_alias_association(self, room_alias, room_id, servers, creator=None): - """ Creates an associatin between a room alias and room_id/servers + """ Creates an association between a room alias and room_id/servers Args: room_alias (RoomAlias) |