summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-06-15 18:26:24 +0100
committerErik Johnston <erik@matrix.org>2015-06-15 18:26:24 +0100
commitf13890ddcec3c581cb7a9c5fd07b856134fbf5f6 (patch)
tree9af75062a32c58bd986ec9306d9ff570cb92e84f
parentDisable twisted access logging. Move access logging to SynapseRequest object (diff)
parentMerge pull request #185 from matrix-org/erikj/listeners_config (diff)
downloadsynapse-f13890ddcec3c581cb7a9c5fd07b856134fbf5f6.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sanitize_logging
Diffstat (limited to '')
-rw-r--r--CHANGES.rst13
-rw-r--r--synapse/__init__.py2
-rw-r--r--synapse/storage/schema/delta/20/dummy.sql1
3 files changed, 11 insertions, 5 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 778d3c00ec..62aecda27a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,17 +1,22 @@
+Changes in synapse v0.9.2-r2 (2015-06-15)
+=========================================
+
+Fix packaging so that schema delta python files get included in the package.
+
 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..d111335a1a 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-r2"
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;