diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-18 15:53:39 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-18 15:53:39 +0000 |
| commit | 1fe973fa5a2a8b8adbf336d1f3a81b806f6f28bd (patch) | |
| tree | ce7ac77b3714ccaa6d54cb30201ce5cfa2041e63 | |
| parent | Merge pull request #384 from matrix-org/erikj/shorter_retries (diff) | |
| parent | Merge branch 'hotfixes-v0.11.0-r1' (diff) | |
| download | synapse-1fe973fa5a2a8b8adbf336d1f3a81b806f6f28bd.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
| -rw-r--r-- | CHANGES.rst | 6 | ||||
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 068ed9f2ff..5bea8e82d5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,9 @@ +Changes in synapse v0.11.0-r1 (2015-11-18) +========================================== + +* Retry and fail federation requests more aggressively for requests that block + client side requests (PR #384) + Changes in synapse v0.11.0 (2015-11-17) ======================================= diff --git a/README.rst b/README.rst index a8f0c62158..d0151cbf82 100644 --- a/README.rst +++ b/README.rst @@ -133,6 +133,8 @@ In case of problems, please see the _Troubleshooting section below. Alternatively, Silvio Fricke has contributed a Dockerfile to automate the above in Docker at https://registry.hub.docker.com/u/silviof/docker-matrix/. +Another alternative is to install via apt from http://matrix.org/packages/debian/. + To set up your homeserver, run (in your virtualenv, as before):: cd ~/.synapse diff --git a/synapse/__init__.py b/synapse/__init__.py index f0eac97bab..5a83f5f3ec 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.11.0" +__version__ = "0.11.0-r1" |