diff options
| author | Erik Johnston <erik@matrix.org> | 2017-10-02 16:20:23 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-10-02 16:20:23 +0100 |
| commit | 90d70af269f930f7b76a612ea1946be1fc33a6db (patch) | |
| tree | acb44def7327c19932e1017ddd39ab067315c016 | |
| parent | Merge pull request #2480 from matrix-org/rav/federation_client_logging (diff) | |
| parent | Merge branch 'release-v0.23.0' of github.com:matrix-org/synapse (diff) | |
| download | synapse-90d70af269f930f7b76a612ea1946be1fc33a6db.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
| -rw-r--r-- | CHANGES.rst | 6 | ||||
| -rw-r--r-- | contrib/systemd/synapse.service | 5 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 6291fedb9a..4be6604ddd 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,9 @@ +Changes in synapse v0.23.0 (2017-10-02) +======================================= + +No changes since v0.23.0-rc2 + + Changes in synapse v0.23.0-rc2 (2017-09-26) =========================================== diff --git a/contrib/systemd/synapse.service b/contrib/systemd/synapse.service index 92d94b9d58..3f037055b9 100644 --- a/contrib/systemd/synapse.service +++ b/contrib/systemd/synapse.service @@ -9,9 +9,10 @@ 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 +ExecStart=/usr/bin/python2.7 -m synapse.app.homeserver --config-path=/etc/synapse/homeserver.yaml +ExecStop=/usr/bin/synctl stop /etc/synapse/homeserver.yaml [Install] WantedBy=multi-user.target + diff --git a/synapse/__init__.py b/synapse/__init__.py index ec83e6adb7..97d6c4094d 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.23.0-rc2" +__version__ = "0.23.0" |