diff options
| author | Erik Johnston <erik@matrix.org> | 2015-06-15 14:16:12 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-06-15 14:16:12 +0100 |
| commit | cebde85b94692cfe062d74bb2c884dd097dc8bb4 (patch) | |
| tree | 97599d7f663d6a727c470f240f2971ac9a9e42c9 | |
| parent | Merge pull request #183 from intelfx/install-python-schema-deltas (diff) | |
| parent | Merge pull request #184 from matrix-org/hotfixes-v0.9.2-r1 (diff) | |
| download | synapse-cebde85b94692cfe062d74bb2c884dd097dc8bb4.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into hotfixes-v0.9.2-r2
| -rw-r--r-- | CHANGES.rst | 8 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/storage/schema/delta/20/dummy.sql | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 778d3c00ec..ac398728f8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -3,15 +3,15 @@ Changes in synapse v0.9.2 (2015-06-12) General: -* Use ultrajson for json deserialisation, and for serialisation when a - canonical encoding is not required. Ultrajson is significantly faster - than simplejson in some circumstances. +* Use ultrajson for json (de)serialisation when a canonical encoding is not + required. Ultrajson is significantly faster than simplejson in certain + circumstances. * Use connection pools for outgoing HTTP connections. * Process thumbnails on separate threads. Configuration: -* Add option to disable HTTP response compression. +* Add option, ``gzip_responses``, to disable HTTP response compression. Federation: diff --git a/synapse/__init__.py b/synapse/__init__.py index e6088dc6cc..b6ac0dab32 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.9.2" +__version__ = "0.9.2-r1" diff --git a/synapse/storage/schema/delta/20/dummy.sql b/synapse/storage/schema/delta/20/dummy.sql new file mode 100644 index 0000000000..e0ac49d1ec --- /dev/null +++ b/synapse/storage/schema/delta/20/dummy.sql @@ -0,0 +1 @@ +SELECT 1; |