From e83f8c0aa57cdc084edb19044c60a69c504f8cef Mon Sep 17 00:00:00 2001
From: Oleg Girko
Date: Thu, 14 Apr 2016 14:46:18 +0100
Subject: [PATCH 1/5] Add environment file to systemd unit configuration.
Now there is at least one environment variable that controls
synapse server's behaviour: SYNAPSE_CACHE_FACTOR.
So, it makes sense to make systemd unit file to use
environment configuration file that can set this variable's value.
Signed-off-by: Oleg Girko
---
contrib/systemd/synapse.service | 1 +
1 file changed, 1 insertion(+)
diff --git a/contrib/systemd/synapse.service b/contrib/systemd/synapse.service
index 2e8cd21c9e..967a4debfd 100644
--- a/contrib/systemd/synapse.service
+++ b/contrib/systemd/synapse.service
@@ -9,6 +9,7 @@ Description=Synapse Matrix homeserver
Type=simple
User=synapse
Group=synapse
+EnvironmentFile=-/etc/sysconfig/synapse
WorkingDirectory=/var/lib/synapse
ExecStart=/usr/bin/python2.7 -m synapse.app.homeserver --config-path=/etc/synapse/homeserver.yaml --log-config=/etc/synapse/log_config.yaml
From 1b45e6a9bce2d46d956c0923bf02bfd170839550 Mon Sep 17 00:00:00 2001
From: David
Date: Fri, 6 May 2016 02:07:59 +0800
Subject: [PATCH 2/5] Fix Typo in README.rst s/Halp/Help/
---
README.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.rst b/README.rst
index 285fc5aa8a..95e7257115 100644
--- a/README.rst
+++ b/README.rst
@@ -587,7 +587,7 @@ Building internal API documentation::
-Halp!! Synapse eats all my RAM!
+Help!! Synapse eats all my RAM!
===============================
Synapse's architecture is quite RAM hungry currently - we deliberately
From 8b5dbee47ebafc8243abb25a1771bd1983d48306 Mon Sep 17 00:00:00 2001
From: Jimmy Cuadra
Date: Sun, 29 May 2016 02:31:56 -0700
Subject: [PATCH 3/5] Alter phrasing to clarify where info is stored.
A user on #matrix:matrix.org was confused by the phrasing of the first
sentence in the paragraph and couldn't tell whether it was saying that
the homeserver stored the data or the clients did. This change splits it
into two sentences to make the subject of each sentence clear.
---
README.rst | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/README.rst b/README.rst
index 95e7257115..722ff9f11f 100644
--- a/README.rst
+++ b/README.rst
@@ -58,12 +58,13 @@ the spec in the context of a codebase and let you run your own homeserver and
generally help bootstrap the ecosystem.
In Matrix, every user runs one or more Matrix clients, which connect through to
-a Matrix homeserver which stores all their personal chat history and user
-account information - much as a mail client connects through to an IMAP/SMTP
-server. Just like email, you can either run your own Matrix homeserver and
-control and own your own communications and history or use one hosted by
-someone else (e.g. matrix.org) - there is no single point of control or
-mandatory service provider in Matrix, unlike WhatsApp, Facebook, Hangouts, etc.
+a Matrix homeserver. The homeserver stores all their personal chat history and
+user account information - much as a mail client connects through to an
+IMAP/SMTP server. Just like email, you can either run your own Matrix
+homeserver and control and own your own communications and history or use one
+hosted by someone else (e.g. matrix.org) - there is no single point of control
+or mandatory service provider in Matrix, unlike WhatsApp, Facebook, Hangouts,
+etc.
Synapse ships with two basic demo Matrix clients: webclient (a basic group chat
web client demo implemented in AngularJS) and cmdclient (a basic Python
From a31befbcd0f8238920b0ca198d35ef657c78e766 Mon Sep 17 00:00:00 2001
From: Erik Johnston
Date: Thu, 9 Jun 2016 13:23:41 +0100
Subject: [PATCH 4/5] Bump version and changelog
---
CHANGES.rst | 10 ++++++++++
synapse/__init__.py | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/CHANGES.rst b/CHANGES.rst
index 6194b3eb69..ad974c586b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+Changes in synapse v0.16.0 (2016-06-09)
+=======================================
+
+NB: As of v0.14 all AS config files must have an ID specified.
+
+
+Bug fixes:
+
+* Don't make rooms published by default (PR #857)
+
Changes in synapse v0.16.0-rc2 (2016-06-08)
===========================================
diff --git a/synapse/__init__.py b/synapse/__init__.py
index ad088a7880..dc211e9637 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.16.0-rc2"
+__version__ = "0.16.0"
From 8327d5df709f1726c961743d937852e487648f5b Mon Sep 17 00:00:00 2001
From: Erik Johnston
Date: Thu, 9 Jun 2016 14:16:26 +0100
Subject: [PATCH 5/5] Change CHANGELOG
---
CHANGES.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGES.rst b/CHANGES.rst
index ad974c586b..32f18e7098 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,7 +1,7 @@
Changes in synapse v0.16.0 (2016-06-09)
=======================================
-NB: As of v0.14 all AS config files must have an ID specified.
+NB: As of v0.14 all AS config files must have an ID field.
Bug fixes: