summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-02-13 14:46:18 +0000
committerRichard van der Hoff <richard@matrix.org>2019-02-13 14:46:18 +0000
commit3bc238629eb61e6a3f6c652e3ddae3261179d624 (patch)
tree8fbaed67cb8e2733cb9c236e2f598837dca52b0c
parentMerge pull request #4636 from matrix-org/rav/bind_address_fixes (diff)
downloadsynapse-3bc238629eb61e6a3f6c652e3ddae3261179d624.tar.xz
0.99.1rc2 v0.99.1rc2
-rw-r--r--CHANGES.md9
-rw-r--r--changelog.d/4636.bugfix1
-rw-r--r--synapse/__init__.py2
3 files changed, 10 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index cc629978c2..d0b3437b2d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 0.99.1rc2 (2019-02-13)
+==============================
+
+Bugfixes
+--------
+
+- Fix errors when using default bind_addresses with replication/metrics listeners. ([\#4636](https://github.com/matrix-org/synapse/issues/4636))
+
+
 Synapse 0.99.1rc1 (2019-02-12)
 ==============================
 
diff --git a/changelog.d/4636.bugfix b/changelog.d/4636.bugfix
deleted file mode 100644
index 7607aa1d53..0000000000
--- a/changelog.d/4636.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix errors when using default bind_addresses with replication/metrics listeners.
\ No newline at end of file
diff --git a/synapse/__init__.py b/synapse/__init__.py
index c211cb4e6f..4629fa76ec 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.1rc1"
+__version__ = "0.99.1rc2"