Merge branch 'master' of github.com:matrix-org/synapse into hotfixes-v0.9.2-r2

pull/186/head
Erik Johnston 2015-06-15 14:16:12 +01:00
commit cebde85b94
3 changed files with 6 additions and 5 deletions

View File

@ -3,15 +3,15 @@ Changes in synapse v0.9.2 (2015-06-12)
General: General:
* Use ultrajson for json deserialisation, and for serialisation when a * Use ultrajson for json (de)serialisation when a canonical encoding is not
canonical encoding is not required. Ultrajson is significantly faster required. Ultrajson is significantly faster than simplejson in certain
than simplejson in some circumstances. circumstances.
* Use connection pools for outgoing HTTP connections. * Use connection pools for outgoing HTTP connections.
* Process thumbnails on separate threads. * Process thumbnails on separate threads.
Configuration: Configuration:
* Add option to disable HTTP response compression. * Add option, ``gzip_responses``, to disable HTTP response compression.
Federation: Federation:

View File

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server. """ This is a reference implementation of a Matrix home server.
""" """
__version__ = "0.9.2" __version__ = "0.9.2-r1"

View File

@ -0,0 +1 @@
SELECT 1;