From 4dd47236e736ae201a3bde4d6048e37416cddc22 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 12 Jun 2015 11:42:52 +0100 Subject: [PATCH 1/7] Update change log --- CHANGES.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 778d3c00ec..fa35a51fbb 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -3,9 +3,9 @@ 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 some + circumstances. * Use connection pools for outgoing HTTP connections. * Process thumbnails on separate threads. From a3dc31cab98a107d98ad014eb91e4a0b5dff1450 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 12 Jun 2015 11:45:13 +0100 Subject: [PATCH 2/7] s/some/certain --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index fa35a51fbb..b7b1fdfbd2 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,7 +4,7 @@ Changes in synapse v0.9.2 (2015-06-12) General: * Use ultrajson for json (de)serialisation when a canonical encoding is not - required. Ultrajson is significantly faster than simplejson in some + required. Ultrajson is significantly faster than simplejson in certain circumstances. * Use connection pools for outgoing HTTP connections. * Process thumbnails on separate threads. From 1a87f5f26c6c54856bf53516ad4d820da45e146d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 12 Jun 2015 11:46:41 +0100 Subject: [PATCH 3/7] Mention config option name --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index b7b1fdfbd2..ac398728f8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -11,7 +11,7 @@ General: Configuration: -* Add option to disable HTTP response compression. +* Add option, ``gzip_responses``, to disable HTTP response compression. Federation: From 2eda996a6390dd746a4274db5b276a4388e90d70 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Sat, 13 Jun 2015 12:21:58 +0100 Subject: [PATCH 4/7] Add a dummy.sql into delta/20 as pip isn't packinging the pushers.py --- synapse/storage/schema/delta/20/dummy.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 synapse/storage/schema/delta/20/dummy.sql 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; From 6c01ceb8d0aefd68d3e9bc63a0f0b84edfd4e808 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Sat, 13 Jun 2015 12:22:14 +0100 Subject: [PATCH 5/7] Bump version --- synapse/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From 7f7ec84d6fcc707f225d5697f690c6888a7d1977 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 15 Jun 2015 14:16:29 +0100 Subject: [PATCH 6/7] Bump version --- synapse/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/__init__.py b/synapse/__init__.py index b6ac0dab32..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-r1" +__version__ = "0.9.2-r2" From 2acee97c2b304f3da07917df191f625b21b92335 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 15 Jun 2015 14:20:25 +0100 Subject: [PATCH 7/7] Changelog --- CHANGES.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index ac398728f8..62aecda27a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,8 @@ +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) ======================================