From 2b8903ce2fe56a5cc72d48de9282ee4e176f4b83 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sat, 14 Feb 2015 00:16:33 +0000 Subject: [PATCH 1/3] we federate on port 8448 nowadays... --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 5eebe5b721..d3778b9f2e 100644 --- a/README.rst +++ b/README.rst @@ -6,7 +6,7 @@ VoIP. The basics you need to know to get up and running are: - Everything in Matrix happens in a room. Rooms are distributed and do not exist on any single server. Rooms can be located using convenience aliases - like ``#matrix:matrix.org`` or ``#test:localhost:8008``. + like ``#matrix:matrix.org`` or ``#test:localhost:8448``. - Matrix user IDs look like ``@matthew:matrix.org`` (although in the future you will normally refer to yourself and others using a 3PID: email From b99a33f283d595f5f462ab039d672ca04bdffcb8 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Sun, 15 Feb 2015 20:20:51 +0000 Subject: [PATCH 2/3] resolve_events expect lists, not dicts --- synapse/handlers/federation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 4cd795e202..3aecc1ca51 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -879,7 +879,7 @@ class FederationHandler(BaseHandler): }) new_state, prev_state = self.state_handler.resolve_events( - [local_view, remote_view], + [local_view.values(), remote_view.values()], event ) From 6dd5c958412ac9c589996c8c5d92eeacdbeb734b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Sun, 15 Feb 2015 20:38:52 +0000 Subject: [PATCH 3/3] Bump version --- synapse/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/__init__.py b/synapse/__init__.py index 1a02aefe26..792b8089f6 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.7.0e" +__version__ = "0.7.0f"